| Index: ash/display/display_change_observer_chromeos_unittest.cc
|
| diff --git a/ash/display/display_change_observer_chromeos_unittest.cc b/ash/display/display_change_observer_chromeos_unittest.cc
|
| index dc8d492742d9884045f150649168fdcaa359603d..a437aec64c53dc409c0039ae43a8e09761030e1e 100644
|
| --- a/ash/display/display_change_observer_chromeos_unittest.cc
|
| +++ b/ash/display/display_change_observer_chromeos_unittest.cc
|
| @@ -30,28 +30,28 @@ TEST_F(DisplayChangeObserverTest, TestBlackListedDisplay) {
|
|
|
| TEST_F(DisplayChangeObserverTest, GetResolutionList) {
|
| OutputConfigurator::OutputSnapshot output;
|
| - output.mode_infos[11] = OutputConfigurator::ModeInfo(1920, 1200, false);
|
| + output.mode_infos[11] = OutputConfigurator::ModeInfo(1920, 1200, false, 60);
|
|
|
| // All non-interlaced (as would be seen with different refresh rates).
|
| - output.mode_infos[12] = OutputConfigurator::ModeInfo(1920, 1080, false);
|
| - output.mode_infos[13] = OutputConfigurator::ModeInfo(1920, 1080, false);
|
| - output.mode_infos[14] = OutputConfigurator::ModeInfo(1920, 1080, false);
|
| + output.mode_infos[12] = OutputConfigurator::ModeInfo(1920, 1080, false, 80);
|
| + output.mode_infos[13] = OutputConfigurator::ModeInfo(1920, 1080, false, 70);
|
| + output.mode_infos[14] = OutputConfigurator::ModeInfo(1920, 1080, false, 60);
|
|
|
| // Interlaced vs non-interlaced.
|
| - output.mode_infos[15] = OutputConfigurator::ModeInfo(1280, 720, true);
|
| - output.mode_infos[16] = OutputConfigurator::ModeInfo(1280, 720, false);
|
| + output.mode_infos[15] = OutputConfigurator::ModeInfo(1280, 720, true, 60);
|
| + output.mode_infos[16] = OutputConfigurator::ModeInfo(1280, 720, false, 60);
|
|
|
| // Interlaced only.
|
| - output.mode_infos[17] = OutputConfigurator::ModeInfo(1024, 768, true);
|
| - output.mode_infos[18] = OutputConfigurator::ModeInfo(1024, 768, true);
|
| + output.mode_infos[17] = OutputConfigurator::ModeInfo(1024, 768, true, 70);
|
| + output.mode_infos[18] = OutputConfigurator::ModeInfo(1024, 768, true, 60);
|
|
|
| // Mixed.
|
| - output.mode_infos[19] = OutputConfigurator::ModeInfo(1024, 600, true);
|
| - output.mode_infos[20] = OutputConfigurator::ModeInfo(1024, 600, false);
|
| - output.mode_infos[21] = OutputConfigurator::ModeInfo(1024, 600, false);
|
| + output.mode_infos[19] = OutputConfigurator::ModeInfo(1024, 600, true, 60);
|
| + output.mode_infos[20] = OutputConfigurator::ModeInfo(1024, 600, false, 70);
|
| + output.mode_infos[21] = OutputConfigurator::ModeInfo(1024, 600, false, 60);
|
|
|
| // Just one interlaced mode.
|
| - output.mode_infos[22] = OutputConfigurator::ModeInfo(640, 480, true);
|
| + output.mode_infos[22] = OutputConfigurator::ModeInfo(640, 480, true, 60);
|
|
|
| std::vector<Resolution> resolutions =
|
| DisplayChangeObserver::GetResolutionList(output);
|
|
|