Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

ui/aura/bench/bench_main.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 "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/i18n/icu_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/string_split.h"
 #include "base/time.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 #include "ui/aura/client/default_capture_client.h"
+#include "ui/aura/display_util.h"
 #include "ui/aura/env.h"
 #include "ui/aura/focus_manager.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/base/hit_test.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/compositor_observer.h"
 #include "ui/compositor/debug_utils.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/test/compositor_test_support.h"
 #include "ui/gfx/canvas.h"
@@ skipping 260 matching lines @@
   CommandLine::Init(argc, argv);
 
   base::AtExitManager exit_manager;
 
   ui::RegisterPathProvider();
   icu_util::Initialize();
   ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
 
   MessageLoop message_loop(MessageLoop::TYPE_UI);
   ui::CompositorTestSupport::Initialize();
-  aura::SingleDisplayManager* manager = new aura::SingleDisplayManager;
-  manager->set_use_fullscreen_host_window(true);
-  aura::Env::GetInstance()->SetDisplayManager(manager);
+  aura::Env::GetInstance();
+  aura::SetUseFullscreenHostWindow(true);
+  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());
   aura::client::SetCaptureClient(
       root_window.get(),
       new aura::client::DefaultCaptureClient(root_window.get()));
 
   scoped_ptr<aura::FocusManager> focus_manager(new aura::FocusManager);
   root_window->set_focus_manager(focus_manager.get());
 
   // add layers
   ColoredLayer background(SK_ColorRED);
   background.SetBounds(root_window->bounds());
@@ skipping 36 matching lines @@
 
   root_window->ShowRootWindow();
   MessageLoopForUI::current()->Run();
   focus_manager.reset();
   root_window.reset();
 
   ui::CompositorTestSupport::Terminate();
 
   return 0;
 }