Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

ui/aura/demo/demo_main.cc

Index: ui/aura/demo/demo_main.cc
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index 451affb5070e8c313631db4d6ba23c625eb5544b..77d899f5fc493d85d4f5a89f321b51fe04f5bb37 100644
--- a/ui/aura/demo/demo_main.cc
+++ b/ui/aura/demo/demo_main.cc
@@ -12,7 +12,7 @@
 #include "ui/aura/client/stacking_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/single_display_manager.h"
+#include "ui/aura/test/test_screen.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/events/event.h"
@@ -121,9 +121,11 @@ int DemoMain() {
   // Create the message-loop here before creating the root window.
   MessageLoop message_loop(MessageLoop::TYPE_UI);
   ui::CompositorTestSupport::Initialize();
-  aura::Env::GetInstance()->SetDisplayManager(new aura::SingleDisplayManager);
+  aura::Env::GetInstance();
+  aura::TestScreen test_screen;
+  gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, &test_screen);
   scoped_ptr<aura::RootWindow> root_window(
-      aura::DisplayManager::CreateRootWindowForPrimaryDisplay());
+      test_screen.CreateRootWindowForPrimaryDisplay());
   scoped_ptr<DemoStackingClient> stacking_client(new DemoStackingClient(
       root_window.get()));