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 b0b3810ee41641ea0e7529a90e971e6d0d79e4e0..96871fef51be3d3800c1cee54b77b1c3c9a0b3f9 100644 |
--- a/ash/display/display_error_observer_chromeos_unittest.cc |
+++ b/ash/display/display_error_observer_chromeos_unittest.cc |
@@ -45,7 +45,9 @@ TEST_F(DisplayErrorObserverTest, Normal) { |
return; |
UpdateDisplay("200x200,300x300"); |
- observer()->OnDisplayModeChangeFailed(ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR); |
+ observer()->OnDisplayModeChangeFailed( |
+ ui::DisplayConfigurator::DisplayStateList(), |
+ ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR); |
EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING), |
GetMessageContents()); |
} |
@@ -55,11 +57,15 @@ TEST_F(DisplayErrorObserverTest, CallTwice) { |
return; |
UpdateDisplay("200x200,300x300"); |
- observer()->OnDisplayModeChangeFailed(ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR); |
+ observer()->OnDisplayModeChangeFailed( |
+ ui::DisplayConfigurator::DisplayStateList(), |
+ ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR); |
base::string16 message = GetMessageContents(); |
EXPECT_FALSE(message.empty()); |
- observer()->OnDisplayModeChangeFailed(ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR); |
+ observer()->OnDisplayModeChangeFailed( |
+ ui::DisplayConfigurator::DisplayStateList(), |
+ ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR); |
base::string16 message2 = GetMessageContents(); |
EXPECT_FALSE(message2.empty()); |
EXPECT_EQ(message, message2); |
@@ -70,11 +76,14 @@ TEST_F(DisplayErrorObserverTest, CallWithDifferentState) { |
return; |
UpdateDisplay("200x200,300x300"); |
- observer()->OnDisplayModeChangeFailed(ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR); |
+ observer()->OnDisplayModeChangeFailed( |
+ ui::DisplayConfigurator::DisplayStateList(), |
+ ui::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); |
EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING), |
GetMessageContents()); |