Move ash::DisplayInfo to ui

ui/display/manager/display_info.h

Index: ui/display/manager/display_info.h
diff --git a/ash/common/display/display_info.h b/ui/display/manager/display_info.h
similarity index 97%
rename from ash/common/display/display_info.h
rename to ui/display/manager/display_info.h
index e5467d40ab7171847d35c017a14a17cc8458af74..baed178e29385520003eea08f3b211f81a05e426 100644
--- a/ash/common/display/display_info.h
+++ b/ui/display/manager/display_info.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_COMMON_DISPLAY_DISPLAY_INFO_H_
-#define ASH_COMMON_DISPLAY_DISPLAY_INFO_H_
+#ifndef UI_DISPLAY_CHROMEOS_DISPLAY_INFO_H_
+#define UI_DISPLAY_CHROMEOS_DISPLAY_INFO_H_
 
 #include <stdint.h>
 
@@ -11,18 +11,18 @@
 #include <string>
 #include <vector>
 
-#include "ash/ash_export.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "ui/display/display.h"
+#include "ui/display/display_export.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 
-namespace ash {
+namespace ui {
 
 // A class that represents the display's mode info.
-class ASH_EXPORT ManagedDisplayMode
+class DISPLAY_EXPORT ManagedDisplayMode
     : public base::RefCounted<ManagedDisplayMode> {
  public:
   ManagedDisplayMode();
@@ -74,7 +74,7 @@ class ASH_EXPORT ManagedDisplayMode
 // create |display::Display| as well as to maintain extra infomation
 // to manage displays in ash environment.
 // This class is intentionally made copiable.
-class ASH_EXPORT DisplayInfo {
+class DISPLAY_EXPORT DisplayInfo {
  public:
   using ManagedDisplayModeList = std::vector<scoped_refptr<ManagedDisplayMode>>;
 
@@ -357,8 +357,8 @@ class ASH_EXPORT DisplayInfo {
 
 // Resets the synthesized display id for testing. This
 // is necessary to avoid overflowing the output index.
-ASH_EXPORT void ResetDisplayIdForTest();
+void DISPLAY_EXPORT ResetDisplayIdForTest();
 
-}  // namespace ash
+}  // namespace ui
 
-#endif  //  ASH_COMMON_DISPLAY_DISPLAY_INFO_H_
+#endif  //  UI_DISPLAY_CHROMEOS_DISPLAY_INFO_H_