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

ui/display/manager/json_converter_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // 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>
 
 #include "base/json/json_reader.h"
 #include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/display_layout.h"
 
-namespace ash {
+namespace display {
 
 TEST(JsonConverterTest, JsonFromToDisplayLayout) {
   display::DisplayLayout layout;
   layout.primary_id = 1;
   layout.mirrored = true;
   layout.default_unified = false;
   layout.placement_list.push_back(display::DisplayPlacement());
   layout.placement_list.push_back(display::DisplayPlacement());
   layout.placement_list[0].display_id = 2;
   layout.placement_list[0].parent_display_id = 1;
@@ skipping 60 matching lines @@
   EXPECT_TRUE(JsonToDisplayLayout(*read_value, &read_layout));
   EXPECT_EQ(true, read_layout.mirrored);
   EXPECT_EQ(1, read_layout.primary_id);
   EXPECT_FALSE(read_layout.default_unified);
   ASSERT_EQ(1u, read_layout.placement_list.size());
   EXPECT_EQ(display::DisplayPlacement::BOTTOM,
             read_layout.placement_list[0].position);
   EXPECT_EQ(20, read_layout.placement_list[0].offset);
 }
 
-}  // namespace ash
+}  // namespace display