Relocate display_manager from ash to ui

ui/display/test/display_manager_test_api.h

Index: ui/display/test/display_manager_test_api.h
diff --git a/ash/test/display_manager_test_api.h b/ui/display/test/display_manager_test_api.h
similarity index 93%
rename from ash/test/display_manager_test_api.h
rename to ui/display/test/display_manager_test_api.h
index 5624aa82810d993990ea35163cb5d6fda18c7012..6660e848a02a8a8ce5e590598d2d8e7611c6f38e 100644
--- a/ash/test/display_manager_test_api.h
+++ b/ui/display/test/display_manager_test_api.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_TEST_DISPLAY_MANAGER_TEST_API_H_
-#define ASH_TEST_DISPLAY_MANAGER_TEST_API_H_
+#ifndef UI_DISPLAY_TEST_MANAGER_TEST_API_H_
+#define UI_DISPLAY_TEST_MANAGER_TEST_API_H_
 
 #include <stdint.h>
 
@@ -12,13 +12,10 @@
 #include <vector>
 
 #include "base/macros.h"
+#include "ui/display/display_export.h"
 #include "ui/display/manager/display_layout.h"
 #include "ui/display/types/display_constants.h"
 
-namespace display {
-class ManagedDisplayInfo;
-}
-
 namespace gfx {
 class Point;
 class Size;
@@ -30,12 +27,13 @@ class EventGenerator;
 }
 }
 
-namespace ash {
+namespace display {
 class DisplayManager;
+class ManagedDisplayInfo;
 
 namespace test {
 
-class DisplayManagerTestApi {
+class DISPLAY_EXPORT DisplayManagerTestApi {
  public:
   explicit DisplayManagerTestApi(DisplayManager* display_manager);
   virtual ~DisplayManagerTestApi();
@@ -111,6 +109,6 @@ display::DisplayIdList CreateDisplayIdList2(int64_t id1, int64_t id2);
 display::DisplayIdList CreateDisplayIdListN(size_t count, ...);
 
 }  // namespace test
-}  // namespace ash
+}  // namespace display
 
-#endif  // ASH_TEST_DISPLAY_MANAGER_TEST_API_H_
+#endif  // UI_DISPLAY_TEST_MANAGER_TEST_API_H_