Merge monitor_reconfigure into powerd.

powerd_unittest.cc

Index: powerd_unittest.cc
diff --git a/powerd_unittest.cc b/powerd_unittest.cc
index 448ea1d4c4e94cac3b5d422dac5fc8f771f499b2..e4573bc0e1880fd456ddd8b4009f27f2b56a0401 100644
--- a/powerd_unittest.cc
+++ b/powerd_unittest.cc
@@ -12,6 +12,7 @@
 #include "metrics/metrics_library_mock.h"
 #include "power_manager/mock_backlight.h"
 #include "power_manager/mock_video_detector.h"
+#include "power_manager/mock_monitor_reconfigure.h"

[Daniel Erat, 2011/04/14 19:18:46]

nit: move before mock_video_detector.h

[marcheu, 2011/04/14 19:54:57]

Done.

 #include "power_manager/power_constants.h"
 #include "power_manager/powerd.h"
 
@@ -48,7 +49,7 @@ class DaemonTest : public Test {
       : prefs_(FilePath("."), FilePath(".")),
         backlight_ctl_(&backlight_, &prefs_),
         daemon_(&backlight_ctl_, &prefs_, &metrics_lib_, &video_detector_,
-                FilePath(".")) {}
+                &monitor_reconfigure_, FilePath(".")) {}
 
   virtual void SetUp() {
     // Tests initialization done by the daemon's constructor.
@@ -118,6 +119,7 @@ class DaemonTest : public Test {
 
   StrictMock<MockBacklight> backlight_;
   StrictMock<MockVideoDetector> video_detector_;
+  StrictMock<MockMonitorReconfigureMain> monitor_reconfigure_;
   PowerPrefs prefs_;
   chromeos::PowerStatus status_;
   BacklightController backlight_ctl_;