chromeos: Add testing support code to OutputConfigurator.

chromeos/display/output_configurator.h

 // 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.
 
 #ifndef CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_
 #define CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 159 matching lines @@
                                    CrtcConfig* config1,
                                    CrtcConfig* config2) = 0;
 
     // Configures XInput's Coordinate Transformation Matrix property.
     // |touch_device_id| the ID of the touchscreen device to configure.
     // |ctm| contains the desired transformation parameters.  The offsets
     // in it should be normalized so that 1 corresponds to the X or Y axis
     // size for the corresponding offset.
     virtual void ConfigureCTM(int touch_device_id,
                               const CoordinateTransformation& ctm) = 0;
+
+    // Sends a D-Bus message to the power manager telling it that the
+    // machine is or is not projecting.
+    virtual void SendProjectingStateToPowerManager(bool projecting) = 0;
+  };
+
+  // Helper class used by tests.
+  class TestApi {
+   public:
+    TestApi(OutputConfigurator* configurator, int xrandr_event_base)
+        : configurator_(configurator),
+          xrandr_event_base_(xrandr_event_base) {}
+    ~TestApi() {}
+
+    // Dispatches RRScreenChangeNotify and RRNotify_OutputChange events to
+    // |configurator_| and runs ConfigureOutputs().  Returns false if
+    // |configure_timer_| wasn't started.
+    bool SendOutputChangeEvents(bool connected);
+
+   private:
+    OutputConfigurator* configurator_;  // not owned
+
+    int xrandr_event_base_;
+
+    DISALLOW_COPY_AND_ASSIGN(TestApi);
   };

[oshima, 2013/04/08 17:29:15]

can you move testapi to chromeos/test ? I believe one of
ideas behind test API class to avoid linking test code.

[Daniel Erat, 2013/04/08 21:47:53]

There are a lot of existing examples of TestApi classes.  The big benefit is
that the class's implementation details stay within it instead of spilling out
to friends.  This class is tiny and I'd prefer to keep it here.

[oshima, 2013/04/08 23:21:44]

Ok, I was asked to separate TestApi in the past to avoid linking
test code, but I don't feel strongly about it given that it's small,
so you may keep it as is.

 
   // Flags that can be passed to SetDisplayPower().
   static const int kSetDisplayPowerNoFlags                     = 0;
   // Configure displays even if the passed-in state matches |power_state_|.
   static const int kSetDisplayPowerForceProbe                  = 1 << 0;
   // Do not change the state if multiple displays are connected or if the
   // only connected display is external.
   static const int kSetDisplayPowerOnlyIfSingleInternalDisplay = 1 << 1;
 
+  // Gap between screens so cursor at bottom of active display doesn't
+  // partially appear on top of inactive display. Higher numbers guard
+  // against larger cursors, but also waste more memory.
+  // For simplicity, this is hard-coded to avoid the complexity of always
+  // determining the DPI of the screen and rationalizing which screen we
+  // need to use for the DPI calculation.
+  // See crbug.com/130188 for initial discussion.
+  static const int kVerticalGap = 60;
+
   // Returns true if an output named |name| is an internal display.
   static bool IsInternalOutputName(const std::string& name);
 
   OutputConfigurator();
   virtual ~OutputConfigurator();
 
   int connected_output_count() const { return connected_output_count_; }
 
   OutputState output_state() const { return output_state_; }
 
   void set_display_power_state(DisplayPowerState power_state) {
     power_state_ = power_state;
   }
   DisplayPowerState display_power_state() const { return power_state_; }
 
   void set_state_controller(StateController* controller) {
     state_controller_ = controller;
   }
 
+  // Replaces |delegate_| with |delegate| and sets |configure_display_| to
+  // true.  Should be called before Init().
+  void SetDelegateForTesting(scoped_ptr<Delegate> delegate);
+
   // Initialization, must be called right after constructor.
   // |is_panel_fitting_enabled| indicates hardware panel fitting support.
   // If |background_color_argb| is non zero and there are multiple displays,
   // OutputConfigurator sets the background color of X's RootWindow to this
   // color.
   void Init(bool is_panel_fitting_enabled, uint32 background_color_argb);
 
   // Detects displays first time from unknown state.
   void Start();
 
@@ skipping 81 matching lines @@
   // The timer to delay configuring outputs. See also the comments in
   // |Dispatch()|.
   scoped_ptr<base::OneShotTimer<OutputConfigurator> > configure_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(OutputConfigurator);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_