Remove DisplayState from the public interface for DisplayConfigurator

ui/display/chromeos/display_configurator_unittest.cc

 // Copyright 2014 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 "ui/display/chromeos/display_configurator.h"
 
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/chromeos/test/action_logger_util.h"
@@ skipping 836 matching lines @@
   state_controller_.set_state(MULTIPLE_DISPLAY_STATE_DUAL_MIRROR);
   configurator_.ForceInitialConfigure(0);
   EXPECT_EQ(MULTIPLE_DISPLAY_STATE_DUAL_MIRROR, configurator_.display_state());
 }
 
 TEST_F(DisplayConfiguratorTest, UpdateCachedOutputsEvenAfterFailure) {
   InitWithSingleOutput();
   const DisplayConfigurator::DisplayStateList* cached =
       &configurator_.cached_displays();
   ASSERT_EQ(static_cast<size_t>(1), cached->size());
-  EXPECT_EQ(outputs_[0].current_mode(), (*cached)[0].display->current_mode());
+  EXPECT_EQ(outputs_[0].current_mode(), (*cached)[0]->current_mode());
 
   // After connecting a second output, check that it shows up in
   // |cached_displays_| even if an invalid state is requested.
   state_controller_.set_state(MULTIPLE_DISPLAY_STATE_SINGLE);
   UpdateOutputs(2, true);
   cached = &configurator_.cached_displays();
   ASSERT_EQ(static_cast<size_t>(2), cached->size());
-  EXPECT_EQ(outputs_[0].current_mode(), (*cached)[0].display->current_mode());
-  EXPECT_EQ(outputs_[1].current_mode(), (*cached)[1].display->current_mode());
+  EXPECT_EQ(outputs_[0].current_mode(), (*cached)[0]->current_mode());
+  EXPECT_EQ(outputs_[1].current_mode(), (*cached)[1]->current_mode());
 }
 
 TEST_F(DisplayConfiguratorTest, PanelFitting) {
   // Configure the internal display to support only the big mode and the
   // external display to support only the small mode.
   outputs_[0].set_current_mode(&big_mode_);
   outputs_[0].set_native_mode(&big_mode_);
   outputs_[0].set_modes(std::vector<const DisplayMode*>(1, &big_mode_));
 
   outputs_[1].set_current_mode(&small_mode_);
@@ skipping 14 matching lines @@
           GetFramebufferAction(small_mode_.size(), &outputs_[0], &outputs_[1])
               .c_str(),
           GetCrtcAction(outputs_[0], &small_mode_, gfx::Point(0, 0)).c_str(),
           GetCrtcAction(outputs_[1], &small_mode_, gfx::Point(0, 0)).c_str(),
           kForceDPMS, kUngrab, NULL),
       log_->GetActionsAndClear());
 
   // Both outputs should be using the small mode.
   ASSERT_EQ(1, observer_.num_changes());
   ASSERT_EQ(static_cast<size_t>(2), observer_.latest_outputs().size());
-  EXPECT_EQ(&small_mode_, observer_.latest_outputs()[0].mirror_mode);
-  EXPECT_EQ(&small_mode_,
-            observer_.latest_outputs()[0].display->current_mode());
-  EXPECT_EQ(&small_mode_, observer_.latest_outputs()[1].mirror_mode);
-  EXPECT_EQ(&small_mode_,
-            observer_.latest_outputs()[1].display->current_mode());
+  EXPECT_EQ(&small_mode_, observer_.latest_outputs()[0]->current_mode());
+  EXPECT_EQ(&small_mode_, observer_.latest_outputs()[1]->current_mode());
 
   // Also check that the newly-added small mode is present in the internal
   // snapshot that was passed to the observer (http://crbug.com/289159).
-  const DisplayConfigurator::DisplayState& state =
-      observer_.latest_outputs()[0];
-  ASSERT_NE(state.display->modes().end(),
-            std::find(state.display->modes().begin(),
-                      state.display->modes().end(),
-                      &small_mode_));
+  DisplaySnapshot* state = observer_.latest_outputs()[0];
+  ASSERT_NE(
+      state->modes().end(),
+      std::find(state->modes().begin(), state->modes().end(), &small_mode_));
 }
 
 TEST_F(DisplayConfiguratorTest, ContentProtection) {
   configurator_.Init(false);
   configurator_.ForceInitialConfigure(0);
   EXPECT_NE(kNoActions, log_->GetActionsAndClear());
 
   DisplayConfigurator::ContentProtectionClientId id =
       configurator_.RegisterContentProtectionClient();
   EXPECT_NE(0u, id);
@@ skipping 422 matching lines @@
                         GetFramebufferAction(small_mode_.size(), &outputs_[0],
                                              nullptr).c_str(),
                         GetCrtcAction(outputs_[0], &small_mode_,
                                       gfx::Point(0, 0)).c_str(),
                         kUngrab, NULL),
             log_->GetActionsAndClear());
 }
 
 }  // namespace test
 }  // namespace ui