| Index: ui/display/manager/managed_display_info_unittest.cc
|
| diff --git a/ui/display/manager/managed_display_info_unittest.cc b/ui/display/manager/managed_display_info_unittest.cc
|
| index 5fbdb84b1697145d41b20770e0d6a338127be96d..8a06a19e354a07ebba467cd9e79338ff3e2d56fa 100644
|
| --- a/ui/display/manager/managed_display_info_unittest.cc
|
| +++ b/ui/display/manager/managed_display_info_unittest.cc
|
| @@ -29,32 +29,32 @@ TEST_F(DisplayInfoTest, CreateFromSpec) {
|
| EXPECT_EQ(10, info.id());
|
| EXPECT_EQ("0,0 200x100", info.bounds_in_native().ToString());
|
| EXPECT_EQ("200x100", info.size_in_pixel().ToString());
|
| - EXPECT_EQ(display::Display::ROTATE_0, info.GetActiveRotation());
|
| + EXPECT_EQ(Display::ROTATE_0, info.GetActiveRotation());
|
| EXPECT_EQ("0,0,0,0", info.overscan_insets_in_dip().ToString());
|
| EXPECT_EQ(1.0f, info.configured_ui_scale());
|
|
|
| info = ManagedDisplayInfo::CreateFromSpecWithID("10+20-300x400*2/o", 10);
|
| EXPECT_EQ("10,20 300x400", info.bounds_in_native().ToString());
|
| EXPECT_EQ("288x380", info.size_in_pixel().ToString());
|
| - EXPECT_EQ(display::Display::ROTATE_0, info.GetActiveRotation());
|
| + EXPECT_EQ(Display::ROTATE_0, info.GetActiveRotation());
|
| EXPECT_EQ("5,3,5,3", info.overscan_insets_in_dip().ToString());
|
|
|
| info = ManagedDisplayInfo::CreateFromSpecWithID("10+20-300x400*2/ob", 10);
|
| EXPECT_EQ("10,20 300x400", info.bounds_in_native().ToString());
|
| EXPECT_EQ("288x380", info.size_in_pixel().ToString());
|
| - EXPECT_EQ(display::Display::ROTATE_0, info.GetActiveRotation());
|
| + EXPECT_EQ(Display::ROTATE_0, info.GetActiveRotation());
|
| EXPECT_EQ("5,3,5,3", info.overscan_insets_in_dip().ToString());
|
|
|
| info = ManagedDisplayInfo::CreateFromSpecWithID("10+20-300x400*2/or", 10);
|
| EXPECT_EQ("10,20 300x400", info.bounds_in_native().ToString());
|
| EXPECT_EQ("380x288", info.size_in_pixel().ToString());
|
| - EXPECT_EQ(display::Display::ROTATE_90, info.GetActiveRotation());
|
| + EXPECT_EQ(Display::ROTATE_90, info.GetActiveRotation());
|
| // TODO(oshima): This should be rotated too. Fix this.
|
| EXPECT_EQ("5,3,5,3", info.overscan_insets_in_dip().ToString());
|
|
|
| info = ManagedDisplayInfo::CreateFromSpecWithID("10+20-300x400*2/l@1.5", 10);
|
| EXPECT_EQ("10,20 300x400", info.bounds_in_native().ToString());
|
| - EXPECT_EQ(display::Display::ROTATE_270, info.GetActiveRotation());
|
| + EXPECT_EQ(Display::ROTATE_270, info.GetActiveRotation());
|
| EXPECT_EQ(1.5f, info.configured_ui_scale());
|
|
|
| info = ManagedDisplayInfo::CreateFromSpecWithID(
|
|
|