| Index: chromeos/display/output_configurator_unittest.cc
|
| diff --git a/chromeos/display/output_configurator_unittest.cc b/chromeos/display/output_configurator_unittest.cc
|
| index 3d4fbfc11e8afb96445c5c8a4cefeb16d292464e..97d162b44bb9db90a73009520afce8a5c77e7fe1 100644
|
| --- a/chromeos/display/output_configurator_unittest.cc
|
| +++ b/chromeos/display/output_configurator_unittest.cc
|
| @@ -208,8 +208,8 @@ class TestStateController : public OutputConfigurator::StateController {
|
| void set_state(OutputState state) { state_ = state; }
|
|
|
| // OutputConfigurator::StateController overrides:
|
| - virtual OutputState GetStateForOutputs(
|
| - const OutputSnapshotList& outputs) const OVERRIDE { return state_; }
|
| + virtual OutputState GetStateForDisplayIds(
|
| + const std::vector<int64>& outputs) const OVERRIDE { return state_; }
|
|
|
| private:
|
| OutputState state_;
|
| @@ -309,19 +309,6 @@ class OutputConfiguratorTest : public testing::Test {
|
|
|
| } // namespace
|
|
|
| -TEST_F(OutputConfiguratorTest, IsInternalOutputName) {
|
| - EXPECT_TRUE(OutputConfigurator::IsInternalOutputName("LVDS"));
|
| - EXPECT_TRUE(OutputConfigurator::IsInternalOutputName("eDP"));
|
| - EXPECT_TRUE(OutputConfigurator::IsInternalOutputName("LVDSxx"));
|
| - EXPECT_TRUE(OutputConfigurator::IsInternalOutputName("eDPzz"));
|
| -
|
| - EXPECT_FALSE(OutputConfigurator::IsInternalOutputName("xyz"));
|
| - EXPECT_FALSE(OutputConfigurator::IsInternalOutputName("abcLVDS"));
|
| - EXPECT_FALSE(OutputConfigurator::IsInternalOutputName("cdeeDP"));
|
| - EXPECT_FALSE(OutputConfigurator::IsInternalOutputName("LVD"));
|
| - EXPECT_FALSE(OutputConfigurator::IsInternalOutputName("eD"));
|
| -}
|
| -
|
| TEST_F(OutputConfiguratorTest, ConnectSecondOutput) {
|
| InitWithSingleOutput();
|
|
|
|
|