| Index: ui/display/manager/display_manager_utilities_unittest.cc
|
| diff --git a/ui/display/manager/display_manager_utilities_unittest.cc b/ui/display/manager/display_manager_utilities_unittest.cc
|
| index 9f5d9af395f7c85eaf3d2045b6e39543cacfd957..f31ab79a505c88d80ce886ea9902ef01c2f00ae6 100644
|
| --- a/ui/display/manager/display_manager_utilities_unittest.cc
|
| +++ b/ui/display/manager/display_manager_utilities_unittest.cc
|
| @@ -19,17 +19,17 @@ class ScopedSetInternalDisplayId {
|
| };
|
|
|
| ScopedSetInternalDisplayId::ScopedSetInternalDisplayId(int64_t id) {
|
| - display::Display::SetInternalDisplayId(id);
|
| + Display::SetInternalDisplayId(id);
|
| }
|
|
|
| ScopedSetInternalDisplayId::~ScopedSetInternalDisplayId() {
|
| - display::Display::SetInternalDisplayId(kInvalidDisplayId);
|
| + Display::SetInternalDisplayId(kInvalidDisplayId);
|
| }
|
|
|
| } // namespace
|
|
|
| TEST(DisplayUtilitiesTest, GenerateDisplayIdList) {
|
| - display::DisplayIdList list;
|
| + DisplayIdList list;
|
| {
|
| int64_t ids[] = {10, 1};
|
| list = GenerateDisplayIdList(std::begin(ids), std::end(ids));
|
| @@ -99,15 +99,13 @@ TEST(DisplayUtilitiesTest, GenerateDisplayIdList) {
|
| TEST(DisplayUtilitiesTest, DisplayIdListToString) {
|
| {
|
| int64_t ids[] = {10, 1, 16};
|
| - display::DisplayIdList list =
|
| - GenerateDisplayIdList(std::begin(ids), std::end(ids));
|
| + DisplayIdList list = GenerateDisplayIdList(std::begin(ids), std::end(ids));
|
| EXPECT_EQ("1,10,16", DisplayIdListToString(list));
|
| }
|
| {
|
| ScopedSetInternalDisplayId set_internal(16);
|
| int64_t ids[] = {10, 1, 16};
|
| - display::DisplayIdList list =
|
| - GenerateDisplayIdList(std::begin(ids), std::end(ids));
|
| + DisplayIdList list = GenerateDisplayIdList(std::begin(ids), std::end(ids));
|
| EXPECT_EQ("16,1,10", DisplayIdListToString(list));
|
| }
|
| }
|
|
|