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 83% |
rename from ash/display/json_converter_unittest.cc |
rename to ui/display/manager/json_converter_unittest.cc |
index e254c9901d08844f2b60cc13fb402d90a10f58c1..ec30d5177bc2a95eb4ed2a52509cab1c222ad37f 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,22 +11,22 @@ |
#include "testing/gtest/include/gtest/gtest.h" |
#include "ui/display/display_layout.h" |
-namespace ash { |
+namespace display { |
TEST(JsonConverterTest, JsonFromToDisplayLayout) { |
- display::DisplayLayout layout; |
+ 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.push_back(DisplayPlacement()); |
+ layout.placement_list.push_back(DisplayPlacement()); |
layout.placement_list[0].display_id = 2; |
layout.placement_list[0].parent_display_id = 1; |
- layout.placement_list[0].position = display::DisplayPlacement::BOTTOM; |
+ layout.placement_list[0].position = DisplayPlacement::BOTTOM; |
layout.placement_list[1].display_id = 3; |
layout.placement_list[1].parent_display_id = 2; |
- layout.placement_list[1].position = display::DisplayPlacement::LEFT; |
+ layout.placement_list[1].position = DisplayPlacement::LEFT; |
layout.placement_list[1].offset = 30; |
base::DictionaryValue value; |
@@ -57,7 +57,7 @@ TEST(JsonConverterTest, JsonFromToDisplayLayout) { |
<< error_column; |
EXPECT_TRUE(value.Equals(read_value.get())); |
- display::DisplayLayout read_layout; |
+ DisplayLayout read_layout; |
EXPECT_TRUE(JsonToDisplayLayout(*read_value, &read_layout)); |
EXPECT_EQ(read_layout.mirrored, layout.mirrored); |
EXPECT_EQ(read_layout.primary_id, layout.primary_id); |
@@ -81,15 +81,14 @@ TEST(JsonConverterTest, OldJsonToDisplayLayout) { |
ASSERT_EQ(0, error_code) << error_msg << " at " << error_line << ":" |
<< error_column; |
- display::DisplayLayout read_layout; |
+ DisplayLayout read_layout; |
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(DisplayPlacement::BOTTOM, read_layout.placement_list[0].position); |
EXPECT_EQ(20, read_layout.placement_list[0].offset); |
} |
-} // namespace ash |
+} // namespace display |