Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

ash/wm/shelf_layout_manager_unittest.cc

Index: ash/wm/shelf_layout_manager_unittest.cc
diff --git a/ash/wm/shelf_layout_manager_unittest.cc b/ash/wm/shelf_layout_manager_unittest.cc
index 4a4637a995325a385f81738309314903c8f386ff..984ef6c2ebc8748a54a38df4292eb2ebd6b10e0b 100644
--- a/ash/wm/shelf_layout_manager_unittest.cc
+++ b/ash/wm/shelf_layout_manager_unittest.cc
@@ -7,6 +7,7 @@
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_switches.h"
+#include "ash/display/display_manager.h"
 #include "ash/focus_cycler.h"
 #include "ash/launcher/launcher.h"
 #include "ash/root_window_controller.h"
@@ -22,8 +23,6 @@
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "ui/aura/client/aura_constants.h"
-#include "ui/aura/env.h"
-#include "ui/aura/display_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
@@ -204,10 +203,8 @@ TEST_F(ShelfLayoutManagerTest, MAYBE_SetVisible) {
       shelf->launcher_widget()->GetWindowBoundsInScreen());
   int shelf_height = shelf->GetIdealBounds().height();
 
-  const aura::DisplayManager* manager =
-      aura::Env::GetInstance()->display_manager();
-  const gfx::Display& display =
-      manager->GetDisplayNearestWindow(Shell::GetPrimaryRootWindow());
+  const gfx::Display& display = Shell::GetInstance()->display_manager()->
+      GetDisplayNearestWindow(Shell::GetPrimaryRootWindow());
   ASSERT_NE(-1, display.id());
   // Bottom inset should be the max of widget heights.
   EXPECT_EQ(shelf_height,
@@ -256,10 +253,8 @@ TEST_F(ShelfLayoutManagerTest, LayoutShelfWhileAnimating) {
   shelf->LayoutShelf();
   EXPECT_EQ(ShelfLayoutManager::VISIBLE, shelf->visibility_state());
 
-  const aura::DisplayManager* manager =
-      aura::Env::GetInstance()->display_manager();
-  const gfx::Display& display =
-      manager->GetDisplayNearestWindow(Shell::GetPrimaryRootWindow());
+  const gfx::Display& display = Shell::GetInstance()->display_manager()->
+      GetDisplayNearestWindow(Shell::GetPrimaryRootWindow());
 
   // Hide the shelf.
   SetState(shelf, ShelfLayoutManager::HIDDEN);
@@ -613,8 +608,8 @@ TEST_F(ShelfLayoutManagerTest, SetAlignment) {
   shelf->SetAlignment(SHELF_ALIGNMENT_LEFT);
   gfx::Rect launcher_bounds(
       shelf->launcher_widget()->GetWindowBoundsInScreen());
-  const aura::DisplayManager* manager =
-      aura::Env::GetInstance()->display_manager();
+  const internal::DisplayManager* manager =
+      Shell::GetInstance()->display_manager();
   gfx::Display display =
       manager->GetDisplayNearestWindow(Shell::GetPrimaryRootWindow());
   ASSERT_NE(-1, display.id());