Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

ui/aura/test/test_screen.h

Index: ui/aura/test/test_screen.h
diff --git a/ui/aura/test/test_screen.h b/ui/aura/test/test_screen.h
index ca5524c9923fd3c49f420a81d0864c74b8ded951..8b9d74b99d1d5df13ff37705de55495cabf6f4a1 100644
--- a/ui/aura/test/test_screen.h
+++ b/ui/aura/test/test_screen.h
@@ -6,18 +6,34 @@
 #define UI_AURA_TEST_TEST_SCREEN_H_
 
 #include "base/compiler_specific.h"
+#include "ui/aura/window_observer.h"
+#include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
+namespace gfx {
+class Rect;
+}
+
 namespace aura {
 class RootWindow;
+class Window;
 
 // A minimal, testing Aura implementation of gfx::Screen.
-class TestScreen : public gfx::Screen {
+class TestScreen : public gfx::Screen,
+                   public WindowObserver {
  public:
-  explicit TestScreen(aura::RootWindow* root_window);
+  TestScreen();
   virtual ~TestScreen();
 
+  RootWindow* CreateRootWindowForPrimaryDisplay();
+
  protected:
+  // WindowObserver overrides:
+  virtual void OnWindowBoundsChanged(Window* window,
+                                     const gfx::Rect& old_bounds,
+                                     const gfx::Rect& new_bounds) OVERRIDE;
+  virtual void OnWindowDestroying(Window* window) OVERRIDE;
+
   // gfx::Screen overrides:
   virtual bool IsDIPEnabled() OVERRIDE;
   virtual gfx::Point GetCursorScreenPoint() OVERRIDE;
@@ -30,12 +46,14 @@ class TestScreen : public gfx::Screen {
   virtual gfx::Display GetDisplayMatching(
       const gfx::Rect& match_rect) const OVERRIDE;
   virtual gfx::Display GetPrimaryDisplay() const OVERRIDE;
+  virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE;
+  virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE;
 
  private:
-  gfx::Display GetMonitor() const;
-
   aura::RootWindow* root_window_;
 
+  gfx::Display display_;
+
   DISALLOW_COPY_AND_ASSIGN(TestScreen);
 };