| Index: ash/display/display_error_observer_chromeos_unittest.cc
|
| diff --git a/ash/display/display_error_observer_chromeos_unittest.cc b/ash/display/display_error_observer_chromeos_unittest.cc
|
| index baac00e6dcdb9455cfc7959b24ecedb6278e3e86..c3da7d2b7176fce06e7a68c029f03e535243a103 100644
|
| --- a/ash/display/display_error_observer_chromeos_unittest.cc
|
| +++ b/ash/display/display_error_observer_chromeos_unittest.cc
|
| @@ -47,8 +47,8 @@ TEST_F(DisplayErrorObserverTest, Normal) {
|
|
|
| UpdateDisplay("200x200,300x300");
|
| observer()->OnDisplayModeChangeFailed(
|
| - ui::DisplayConfigurator::DisplayStateList(),
|
| - ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR);
|
| + display::DisplayConfigurator::DisplayStateList(),
|
| + display::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR);
|
| EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING),
|
| GetMessageContents());
|
| }
|
| @@ -59,14 +59,14 @@ TEST_F(DisplayErrorObserverTest, CallTwice) {
|
|
|
| UpdateDisplay("200x200,300x300");
|
| observer()->OnDisplayModeChangeFailed(
|
| - ui::DisplayConfigurator::DisplayStateList(),
|
| - ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR);
|
| + display::DisplayConfigurator::DisplayStateList(),
|
| + display::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR);
|
| base::string16 message = GetMessageContents();
|
| EXPECT_FALSE(message.empty());
|
|
|
| observer()->OnDisplayModeChangeFailed(
|
| - ui::DisplayConfigurator::DisplayStateList(),
|
| - ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR);
|
| + display::DisplayConfigurator::DisplayStateList(),
|
| + display::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR);
|
| base::string16 message2 = GetMessageContents();
|
| EXPECT_FALSE(message2.empty());
|
| EXPECT_EQ(message, message2);
|
| @@ -78,14 +78,14 @@ TEST_F(DisplayErrorObserverTest, CallWithDifferentState) {
|
|
|
| UpdateDisplay("200x200,300x300");
|
| observer()->OnDisplayModeChangeFailed(
|
| - ui::DisplayConfigurator::DisplayStateList(),
|
| - ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR);
|
| + display::DisplayConfigurator::DisplayStateList(),
|
| + display::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR);
|
| EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING),
|
| GetMessageContents());
|
|
|
| observer()->OnDisplayModeChangeFailed(
|
| - ui::DisplayConfigurator::DisplayStateList(),
|
| - ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED);
|
| + display::DisplayConfigurator::DisplayStateList(),
|
| + display::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED);
|
| EXPECT_EQ(ash::SubstituteChromeOSDeviceType(
|
| IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING),
|
| GetMessageContents());
|
|
|