Move display preference code from ash/display/ to ui/display/manager/.

ui/display/manager/json_converter_unittest.cc

Index: ui/display/manager/json_converter_unittest.cc
diff --git a/ash/display/json_converter_unittest.cc b/ui/display/manager/json_converter_unittest.cc
similarity index 97%
rename from ash/display/json_converter_unittest.cc
rename to ui/display/manager/json_converter_unittest.cc
index e254c9901d08844f2b60cc13fb402d90a10f58c1..3236e8d43b39523a007432abf290e80ba450c36e 100644
--- a/ash/display/json_converter_unittest.cc
+++ b/ui/display/manager/json_converter_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/display/json_converter.h"
+#include "ui/display/manager/json_converter.h"
 
 #include <memory>
 
@@ -11,7 +11,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/display_layout.h"
 
-namespace ash {
+namespace display {
 
 TEST(JsonConverterTest, JsonFromToDisplayLayout) {
   display::DisplayLayout layout;
@@ -92,4 +92,4 @@ TEST(JsonConverterTest, OldJsonToDisplayLayout) {
   EXPECT_EQ(20, read_layout.placement_list[0].offset);
 }
 
-}  // namespace ash
+}  // namespace display