Rename gfx::Display to display::Display

ui/display/test/display_test_util.h

Index: ui/display/test/display_test_util.h
diff --git a/ui/gfx/test/display_util.h b/ui/display/test/display_test_util.h
similarity index 63%
rename from ui/gfx/test/display_util.h
rename to ui/display/test/display_test_util.h
index 817e26ca1dcfdbac18274c22939d9750c3510da5..a760f86ee725e0c741915fdc753d025cf8170020 100644
--- a/ui/gfx/test/display_util.h
+++ b/ui/display/test/display_test_util.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_GFX_TEST_DISPLAY_UTIL_H_
-#define UI_GFX_TEST_DISPLAY_UTIL_H_
+#ifndef UI_DISPLAY_TEST_DISPLAY_TEST_UTIL_H_
+#define UI_DISPLAY_TEST_DISPLAY_TEST_UTIL_H_
 
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
 
-namespace gfx {
+namespace display {
 
 inline bool operator==(const Display& lhs, const Display& rhs) {
   return lhs.id() == rhs.id() &&
@@ -18,6 +18,10 @@ inline bool operator==(const Display& lhs, const Display& rhs) {
          lhs.touch_support() == rhs.touch_support();
 }
 
-}  // namespace gfx
+void PrintTo(const Display& display, ::std::ostream* os) {
+  *os << display.ToString();
+}
+
+}  // namespace display
 
-#endif  // UI_GFX_TEST_DISPLAY_UTIL_H_
+#endif  // UI_DISPLAY_TEST_DISPLAY_TEST_UTIL_H_