Remove DisplayState from the public interface for DisplayConfigurator

ash/wm/lock_state_controller_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/lock_state_controller.h"
 
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_lock_state_controller_delegate.h"
@@ skipping 889 matching lines @@
   ReleasePowerButton();
 }
 
 #if defined(OS_CHROMEOS)
 TEST_F(LockStateControllerTest, HonorPowerButtonInDockedMode) {
   ScopedVector<const ui::DisplayMode> modes;
   modes.push_back(new ui::DisplayMode(gfx::Size(1, 1), false, 60.0f));
 
   // Create two outputs, the first internal and the second external.
   ui::DisplayConfigurator::DisplayStateList outputs;
-  ui::DisplayConfigurator::DisplayState internal_output;
   ui::TestDisplaySnapshot internal_display;
   internal_display.set_type(ui::DISPLAY_CONNECTION_TYPE_INTERNAL);
   internal_display.set_modes(modes.get());
-  internal_output.display = &internal_display;
-  outputs.push_back(internal_output);
+  outputs.push_back(&internal_display);
 
-  ui::DisplayConfigurator::DisplayState external_output;
   ui::TestDisplaySnapshot external_display;
   external_display.set_type(ui::DISPLAY_CONNECTION_TYPE_HDMI);
   external_display.set_modes(modes.get());
-  external_output.display = &external_display;
-  outputs.push_back(external_output);
+  outputs.push_back(&external_display);
 
   // When all of the displays are turned off (e.g. due to user inactivity), the
   // power button should be ignored.
   power_button_controller_->OnScreenBrightnessChanged(0.0);
-  static_cast<ui::TestDisplaySnapshot*>(outputs[0].display)
-      ->set_current_mode(NULL);
-  static_cast<ui::TestDisplaySnapshot*>(outputs[1].display)
-      ->set_current_mode(NULL);
+  internal_display.set_current_mode(NULL);
+  external_display.set_current_mode(NULL);

[oshima, 2015/03/18 23:02:45]

nullptr

[dnicoara, 2015/03/19 14:47:36]

Done.

   power_button_controller_->OnDisplayModeChanged(outputs);
   PressPowerButton();
   EXPECT_FALSE(test_api_->is_animating_lock());
   ReleasePowerButton();
 
   // When the screen brightness is 0% but the external display is still turned
   // on (indicating either docked mode or the user having manually decreased the
   // brightness to 0%), the power button should still be handled.
-  static_cast<ui::TestDisplaySnapshot*>(outputs[1].display)
-      ->set_current_mode(modes[0]);
+  external_display.set_current_mode(modes[0]);
   power_button_controller_->OnDisplayModeChanged(outputs);
   PressPowerButton();
   EXPECT_TRUE(test_api_->is_animating_lock());
   ReleasePowerButton();
 }
 #endif
 
 // Test that hidden background appears and revers correctly on lock/cancel.
 TEST_F(LockStateControllerTest, TestHiddenBackgroundLockCancel) {
   Initialize(false, user::LOGGED_IN_USER);
@@ skipping 156 matching lines @@
   ReleasePowerButton();
 
   ExpectPreLockAnimationStarted();
 
   test_animator_->CompleteAllAnimations(true);
   EXPECT_EQ(1, lock_state_controller_delegate_->num_lock_requests());
 }
 
 }  // namespace test
 }  // namespace ash