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

chrome/browser/chromeos/display/display_preferences_unittest.cc

Index: chrome/browser/chromeos/display/display_preferences_unittest.cc
diff --git a/chrome/browser/chromeos/display/display_preferences_unittest.cc b/chrome/browser/chromeos/display/display_preferences_unittest.cc
index 7ac6f7bc135110c0459eca45335dae137dd75c59..95373a8c9299b34b86419903b018c30e588f8e71 100644
--- a/chrome/browser/chromeos/display/display_preferences_unittest.cc
+++ b/chrome/browser/chromeos/display/display_preferences_unittest.cc
@@ -13,7 +13,6 @@
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/display_util.h"
-#include "ash/display/json_converter.h"
 #include "ash/display/resolution_notification_controller.h"
 #include "ash/display/screen_orientation_controller_chromeos.h"
 #include "ash/display/window_tree_host_manager.h"
@@ -36,6 +35,7 @@
 #include "ui/display/manager/display_layout_store.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/display_manager_utilities.h"
+#include "ui/display/manager/json_converter.h"
 #include "ui/display/screen.h"
 #include "ui/display/test/display_manager_test_api.h"
 #include "ui/gfx/geometry/vector3d_f.h"
@@ -127,7 +127,7 @@ class DisplayPreferencesTest : public ash::test::AshTestBase {
       if (pref_data->Get(name, &value) && value != nullptr)
         layout_value.reset(value->DeepCopy());
     }
-    if (ash::DisplayLayoutToJson(display_layout, layout_value.get()))
+    if (display::DisplayLayoutToJson(display_layout, layout_value.get()))
       pref_data->Set(name, layout_value.release());
   }
 
@@ -330,7 +330,7 @@ TEST_F(DisplayPreferencesTest, BasicStores) {
   EXPECT_TRUE(displays->GetDictionary(dummy_key, &layout_value));
 
   display::DisplayLayout stored_layout;
-  EXPECT_TRUE(ash::JsonToDisplayLayout(*layout_value, &stored_layout));
+  EXPECT_TRUE(display::JsonToDisplayLayout(*layout_value, &stored_layout));
   ASSERT_EQ(1u, stored_layout.placement_list.size());
 
   EXPECT_EQ(dummy_layout->placement_list[0].position,
@@ -450,7 +450,7 @@ TEST_F(DisplayPreferencesTest, BasicStores) {
   // The layout is swapped.
   EXPECT_TRUE(displays->GetDictionary(key, &layout_value));
 
-  EXPECT_TRUE(ash::JsonToDisplayLayout(*layout_value, &stored_layout));
+  EXPECT_TRUE(display::JsonToDisplayLayout(*layout_value, &stored_layout));
   ASSERT_EQ(1u, stored_layout.placement_list.size());
   const display::DisplayPlacement& stored_placement =
       stored_layout.placement_list[0];
@@ -631,7 +631,7 @@ TEST_F(DisplayPreferencesTest, StoreForSwappedDisplay) {
     const base::DictionaryValue* new_value = nullptr;
     EXPECT_TRUE(displays->GetDictionary(key, &new_value));
     display::DisplayLayout stored_layout;
-    EXPECT_TRUE(ash::JsonToDisplayLayout(*new_value, &stored_layout));
+    EXPECT_TRUE(display::JsonToDisplayLayout(*new_value, &stored_layout));
     ASSERT_EQ(1u, stored_layout.placement_list.size());
     const display::DisplayPlacement& stored_placement =
         stored_layout.placement_list[0];
@@ -650,7 +650,7 @@ TEST_F(DisplayPreferencesTest, StoreForSwappedDisplay) {
     const base::DictionaryValue* new_value = nullptr;
     EXPECT_TRUE(displays->GetDictionary(key, &new_value));
     display::DisplayLayout stored_layout;
-    EXPECT_TRUE(ash::JsonToDisplayLayout(*new_value, &stored_layout));
+    EXPECT_TRUE(display::JsonToDisplayLayout(*new_value, &stored_layout));
     ASSERT_EQ(1u, stored_layout.placement_list.size());
     const display::DisplayPlacement& stored_placement =
         stored_layout.placement_list[0];
@@ -669,7 +669,7 @@ TEST_F(DisplayPreferencesTest, StoreForSwappedDisplay) {
     display::DisplayLayout stored_layout;
 
     EXPECT_TRUE(displays->GetDictionary(key, &new_value));
-    EXPECT_TRUE(ash::JsonToDisplayLayout(*new_value, &stored_layout));
+    EXPECT_TRUE(display::JsonToDisplayLayout(*new_value, &stored_layout));
     ASSERT_EQ(1u, stored_layout.placement_list.size());
     const display::DisplayPlacement& stored_placement =
         stored_layout.placement_list[0];
@@ -1028,7 +1028,7 @@ TEST_F(DisplayPreferencesTest, SaveUnifiedMode) {
       display::DisplayIdListToString(list), &new_value));
 
   display::DisplayLayout stored_layout;
-  EXPECT_TRUE(ash::JsonToDisplayLayout(*new_value, &stored_layout));
+  EXPECT_TRUE(display::JsonToDisplayLayout(*new_value, &stored_layout));
   EXPECT_TRUE(stored_layout.default_unified);
   EXPECT_FALSE(stored_layout.mirrored);
 
@@ -1050,14 +1050,14 @@ TEST_F(DisplayPreferencesTest, SaveUnifiedMode) {
   display_manager()->SetMirrorMode(true);
   ASSERT_TRUE(secondary_displays->GetDictionary(
       display::DisplayIdListToString(list), &new_value));
-  EXPECT_TRUE(ash::JsonToDisplayLayout(*new_value, &stored_layout));
+  EXPECT_TRUE(display::JsonToDisplayLayout(*new_value, &stored_layout));
   EXPECT_TRUE(stored_layout.default_unified);
   EXPECT_TRUE(stored_layout.mirrored);
 
   display_manager()->SetMirrorMode(false);
   ASSERT_TRUE(secondary_displays->GetDictionary(
       display::DisplayIdListToString(list), &new_value));
-  EXPECT_TRUE(ash::JsonToDisplayLayout(*new_value, &stored_layout));
+  EXPECT_TRUE(display::JsonToDisplayLayout(*new_value, &stored_layout));
   EXPECT_TRUE(stored_layout.default_unified);
   EXPECT_FALSE(stored_layout.mirrored);
 
@@ -1066,7 +1066,7 @@ TEST_F(DisplayPreferencesTest, SaveUnifiedMode) {
       display::DisplayManager::EXTENDED);
   ASSERT_TRUE(secondary_displays->GetDictionary(
       display::DisplayIdListToString(list), &new_value));
-  EXPECT_TRUE(ash::JsonToDisplayLayout(*new_value, &stored_layout));
+  EXPECT_TRUE(display::JsonToDisplayLayout(*new_value, &stored_layout));
   EXPECT_FALSE(stored_layout.default_unified);
   EXPECT_FALSE(stored_layout.mirrored);
 }