Merge monitor_reconfigure into powerd.

powerd_unittest.cc

 // Copyright (c) 2011 The Chromium OS 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 <gtest/gtest.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <stdint.h>
 #include <X11/extensions/XTest.h>
 
 #include "base/logging.h"
 #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"
 
 namespace power_manager {
 
 using ::testing::_;
 using ::testing::DoAll;
 using ::testing::InSequence;
 using ::testing::NotNull;
 using ::testing::Return;
@@ skipping 16 matching lines @@
 static const int64 kUnpluggedSuspend = kPluggedSuspend;
 
 bool CheckMetricInterval(time_t now, time_t last, time_t interval);
 
 class DaemonTest : public Test {
  public:
   DaemonTest()
       : 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.
     EXPECT_EQ(0, daemon_.battery_discharge_rate_metric_last_);
     EXPECT_EQ(0, daemon_.battery_remaining_charge_metric_last_);
     EXPECT_EQ(0, daemon_.battery_time_to_empty_metric_last_);
     EXPECT_CALL(backlight_, GetBrightness(NotNull(), NotNull()))
         .WillOnce(DoAll(SetArgumentPointee<0>(kDefaultBrightness),
                         SetArgumentPointee<1>(kMaxBrightness),
                         Return(true)));
@@ skipping 49 matching lines @@
                  Daemon::kMetricBatteryTimeToEmptyBuckets);
   }
 
   // Resets all fields of |info| to 0.
   void ResetPowerStatus(chromeos::PowerStatus& status) {
     memset(&status, 0, sizeof(chromeos::PowerStatus));
   }
 
   StrictMock<MockBacklight> backlight_;
   StrictMock<MockVideoDetector> video_detector_;
+  StrictMock<MockMonitorReconfigureMain> monitor_reconfigure_;
   PowerPrefs prefs_;
   chromeos::PowerStatus status_;
   BacklightController backlight_ctl_;
 
   // StrictMock turns all unexpected calls into hard failures.
   StrictMock<MetricsLibraryMock> metrics_lib_;
   Daemon daemon_;
 };
 
 TEST_F(DaemonTest, CheckMetricInterval) {
@@ skipping 220 matching lines @@
   EXPECT_CALL(backlight_, GetBrightness(NotNull(), NotNull()))
       .WillOnce(DoAll(SetArgumentPointee<0>(kDefaultBrightness),
                       SetArgumentPointee<1>(kMaxBrightness),
                       Return(true)));
   ExpectEnumMetric("Power.BacklightLevelOnAC",
                    kDefaultBrightness, kMaxBrightness);
   daemon_.GenerateBacklightLevelMetricThunk(&daemon_);
 }
 
 }  // namespace power_manager