| Index: ui/display/chromeos/update_display_configuration_task_unittest.cc
|
| diff --git a/ui/display/chromeos/update_display_configuration_task_unittest.cc b/ui/display/chromeos/update_display_configuration_task_unittest.cc
|
| index 5b1c523af9706299268d7c39c589919665df0204..46c83f458cf1bc27d29558c544a4eb05c665e6c9 100644
|
| --- a/ui/display/chromeos/update_display_configuration_task_unittest.cc
|
| +++ b/ui/display/chromeos/update_display_configuration_task_unittest.cc
|
| @@ -220,7 +220,7 @@ TEST_F(UpdateDisplayConfigurationTaskTest, HeadlessConfiguration) {
|
| {
|
| UpdateDisplayConfigurationTask task(
|
| &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_HEADLESS,
|
| - chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
|
| + chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false, false,
|
| base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
|
| base::Unretained(this)));
|
| task.Run();
|
| @@ -239,7 +239,7 @@ TEST_F(UpdateDisplayConfigurationTaskTest, SingleConfiguration) {
|
| {
|
| UpdateDisplayConfigurationTask task(
|
| &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_SINGLE,
|
| - chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
|
| + chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false, false,
|
| base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
|
| base::Unretained(this)));
|
| task.Run();
|
| @@ -263,7 +263,7 @@ TEST_F(UpdateDisplayConfigurationTaskTest, ExtendedConfiguration) {
|
| {
|
| UpdateDisplayConfigurationTask task(
|
| &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED,
|
| - chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
|
| + chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false, false,
|
| base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
|
| base::Unretained(this)));
|
| task.Run();
|
| @@ -292,7 +292,7 @@ TEST_F(UpdateDisplayConfigurationTaskTest, MirrorConfiguration) {
|
| {
|
| UpdateDisplayConfigurationTask task(
|
| &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_DUAL_MIRROR,
|
| - chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
|
| + chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false, false,
|
| base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
|
| base::Unretained(this)));
|
| task.Run();
|
| @@ -318,7 +318,7 @@ TEST_F(UpdateDisplayConfigurationTaskTest, FailMirrorConfiguration) {
|
| {
|
| UpdateDisplayConfigurationTask task(
|
| &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_DUAL_MIRROR,
|
| - chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
|
| + chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false, false,
|
| base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
|
| base::Unretained(this)));
|
| task.Run();
|
| @@ -336,7 +336,7 @@ TEST_F(UpdateDisplayConfigurationTaskTest, FailExtendedConfiguration) {
|
| {
|
| UpdateDisplayConfigurationTask task(
|
| &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED,
|
| - chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
|
| + chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false, false,
|
| base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
|
| base::Unretained(this)));
|
| task.Run();
|
| @@ -365,7 +365,7 @@ TEST_F(UpdateDisplayConfigurationTaskTest, SingleChangePowerConfiguration) {
|
| {
|
| UpdateDisplayConfigurationTask task(
|
| &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_SINGLE,
|
| - chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
|
| + chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false, false,
|
| base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
|
| base::Unretained(this)));
|
| task.Run();
|
| @@ -386,7 +386,7 @@ TEST_F(UpdateDisplayConfigurationTaskTest, SingleChangePowerConfiguration) {
|
| {
|
| UpdateDisplayConfigurationTask task(
|
| &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_SINGLE,
|
| - chromeos::DISPLAY_POWER_ALL_OFF, 0, 0, false,
|
| + chromeos::DISPLAY_POWER_ALL_OFF, 0, 0, false, false,
|
| base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
|
| base::Unretained(this)));
|
| task.Run();
|
| @@ -412,7 +412,7 @@ TEST_F(UpdateDisplayConfigurationTaskTest, NoopSoftwareMirrorConfiguration) {
|
| {
|
| UpdateDisplayConfigurationTask task(
|
| &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED,
|
| - chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
|
| + chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false, false,
|
| base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
|
| base::Unretained(this)));
|
| task.Run();
|
| @@ -423,7 +423,7 @@ TEST_F(UpdateDisplayConfigurationTaskTest, NoopSoftwareMirrorConfiguration) {
|
| {
|
| UpdateDisplayConfigurationTask task(
|
| &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_DUAL_MIRROR,
|
| - chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
|
| + chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false, false,
|
| base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
|
| base::Unretained(this)));
|
| task.Run();
|
| @@ -446,7 +446,7 @@ TEST_F(UpdateDisplayConfigurationTaskTest,
|
| {
|
| UpdateDisplayConfigurationTask task(
|
| &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED,
|
| - chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
|
| + chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false, false,
|
| base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
|
| base::Unretained(this)));
|
| task.Run();
|
| @@ -458,8 +458,8 @@ TEST_F(UpdateDisplayConfigurationTaskTest,
|
| UpdateDisplayConfigurationTask task(
|
| &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_DUAL_MIRROR,
|
| chromeos::DISPLAY_POWER_ALL_ON, 0, 0, true /* force_configure */,
|
| - base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
|
| - base::Unretained(this)));
|
| + false, base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
|
| + base::Unretained(this)));
|
| task.Run();
|
| }
|
|
|
|
|