Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

ash/test/ash_test_base.h

Index: ash/test/ash_test_base.h
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h
index b5007e52027290869a3ce020b90b2e0c592b765b..e21225a991dd5da6547f4ee98cd2205a2b1366d9 100644
--- a/ash/test/ash_test_base.h
+++ b/ash/test/ash_test_base.h
@@ -15,7 +15,7 @@
 
 namespace ash {
 namespace internal {
-class MultiDisplayManager;
+class DisplayManager;
 }  // internal
 
 namespace test {
@@ -46,7 +46,7 @@ class AshTestBase : public testing::Test {
   void ChangeDisplayConfig(float scale, const gfx::Rect& bounds);
 
   // Update the display configuration as given in |display_specs|.
-  // See ash::test::MultiDisplayManagerTestApi::UpdateDisplay for more details.
+  // See ash::test::DisplayManagerTestApi::UpdateDisplay for more details.
   void UpdateDisplay(const std::string& display_specs);
 
  protected: