Move chromeos specific utility functions for display to chromeos/display

chromeos/display/output_configurator_unittest.cc

 // Copyright (c) 2012 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 "chromeos/display/output_configurator.h"
 
 #include <cstdarg>
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 190 matching lines @@
 };
 
 class TestStateController : public OutputConfigurator::StateController {
  public:
   TestStateController() : state_(STATE_DUAL_EXTENDED) {}
   virtual ~TestStateController() {}
 
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(TestStateController);
 };
 
 class OutputConfiguratorTest : public testing::Test {
  public:
   OutputConfiguratorTest()
@@ skipping 10 matching lines @@
     o->output = 1;
     o->crtc = 10;
     o->current_mode = kSmallModeId;
     o->native_mode = kSmallModeId;
     o->mirror_mode = kSmallModeId;
     o->y = 0;
     o->height = kSmallModeHeight;
     o->is_internal = true;
     o->is_aspect_preserving_scaling = true;
     o->touch_device_id = 0;
+    o->has_display_id = true;
 
     o = &outputs_[1];
     o->output = 2;
     o->crtc = 11;
     o->current_mode = kBigModeId;
     o->native_mode = kBigModeId;
     o->mirror_mode = kSmallModeId;
     o->y = 0;
     o->height = kBigModeHeight;
     o->is_internal = false;
     o->is_aspect_preserving_scaling = true;
     o->touch_device_id = 0;
+    o->has_display_id = true;
 
     UpdateOutputs(2);
     delegate_->AddMode(kSmallModeId, kSmallModeWidth, kSmallModeHeight, false);
     delegate_->AddMode(kBigModeId, kBigModeWidth, kBigModeHeight, false);
   }
 
  protected:
   // Predefined modes that can be used by outputs.
   static const int kSmallModeId = 20;
   static const int kSmallModeWidth = 1366;
@@ skipping 37 matching lines @@
   OutputConfigurator::TestApi test_api_;
 
   OutputConfigurator::OutputSnapshot outputs_[2];
 
  private:
   DISALLOW_COPY_AND_ASSIGN(OutputConfiguratorTest);
 };
 
 }  // 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();
 
   // Connect a second output and check that the configurator enters
   // extended mode.
   UpdateOutputs(2);
   const int kDualHeight =
       kSmallModeHeight + OutputConfigurator::kVerticalGap + kBigModeHeight;
   state_controller_.set_state(STATE_DUAL_EXTENDED);
   EXPECT_TRUE(test_api_.SendOutputChangeEvents(true));
@@ skipping 252 matching lines @@
 
   UpdateOutputs(2);
   state_controller_.set_state(STATE_DUAL_EXTENDED);
   EXPECT_TRUE(test_api_.SendOutputChangeEvents(true));
   EXPECT_FALSE(configurator_.SetDisplayMode(STATE_HEADLESS));
   EXPECT_FALSE(configurator_.SetDisplayMode(STATE_SINGLE));
   EXPECT_TRUE(configurator_.SetDisplayMode(STATE_DUAL_MIRROR));
   EXPECT_TRUE(configurator_.SetDisplayMode(STATE_DUAL_EXTENDED));
 }
 
+TEST_F(OutputConfiguratorTest, GetOutputStateForDisplays) {
+  outputs_[0].has_display_id = false;
+  UpdateOutputs(2);
+
+  configurator_.Init(false, 0);
+  configurator_.Start();
+
+  state_controller_.set_state(STATE_DUAL_MIRROR);
+  test_api_.SendOutputChangeEvents(true);
+  EXPECT_EQ(STATE_DUAL_EXTENDED, configurator_.output_state());
+
+  outputs_[0].has_display_id = true;
+  UpdateOutputs(2);
+  test_api_.SendOutputChangeEvents(true);
+  EXPECT_EQ(STATE_DUAL_MIRROR, configurator_.output_state());
+}
+
 }  // namespace chromeos