| Index: base/power_monitor/power_monitor_unittest.cc
|
| diff --git a/base/power_monitor/power_monitor_unittest.cc b/base/power_monitor/power_monitor_unittest.cc
|
| index af3ed419ef9842933b8b048aef339e13e6411b45..5a6f95cac816651319784ca57853d7a79a23cb50 100644
|
| --- a/base/power_monitor/power_monitor_unittest.cc
|
| +++ b/base/power_monitor/power_monitor_unittest.cc
|
| @@ -5,6 +5,7 @@
|
| #include "base/power_monitor/power_monitor.h"
|
|
|
| #include "base/message_loop.h"
|
| +#include "base/power_monitor/power_monitor_device_source.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace base {
|
| @@ -46,13 +47,13 @@ class PowerMonitorTest : public testing::Test {
|
| PowerMonitorTest() {
|
| #if defined(OS_MACOSX)
|
| // This needs to happen before PowerMonitor's ctor.
|
| - PowerMonitor::AllocateSystemIOPorts();
|
| + PowerMonitorDeviceSource::AllocateSystemIOPorts();
|
| #endif
|
| power_monitor_.reset(new PowerMonitor);
|
| }
|
|
|
| - void ProcessPowerEvent(PowerMonitor::PowerEvent event_id) {
|
| - power_monitor_->ProcessPowerEvent(event_id);
|
| + void ProcessPowerEvent(PowerMonitorSource::PowerEvent event_id) {
|
| + power_monitor_->Source()->ProcessPowerEvent(event_id);
|
| }
|
|
|
| virtual ~PowerMonitorTest() {}
|
| @@ -73,32 +74,32 @@ TEST_F(PowerMonitorTest, PowerNotifications) {
|
| // Send a bunch of power changes. Since the battery power hasn't
|
| // actually changed, we shouldn't get notifications.
|
| for (int index = 0; index < 5; index++) {
|
| - ProcessPowerEvent(PowerMonitor::POWER_STATE_EVENT);
|
| + ProcessPowerEvent(PowerMonitorSource::POWER_STATE_EVENT);
|
| EXPECT_EQ(test[0].power_state_changes(), 0);
|
| }
|
|
|
| // Sending resume when not suspended should have no effect.
|
| - ProcessPowerEvent(PowerMonitor::RESUME_EVENT);
|
| + ProcessPowerEvent(PowerMonitorSource::RESUME_EVENT);
|
| message_loop_.RunUntilIdle();
|
| EXPECT_EQ(test[0].resumes(), 0);
|
|
|
| // Pretend we suspended.
|
| - ProcessPowerEvent(PowerMonitor::SUSPEND_EVENT);
|
| + ProcessPowerEvent(PowerMonitorSource::SUSPEND_EVENT);
|
| message_loop_.RunUntilIdle();
|
| EXPECT_EQ(test[0].suspends(), 1);
|
|
|
| // Send a second suspend notification. This should be suppressed.
|
| - ProcessPowerEvent(PowerMonitor::SUSPEND_EVENT);
|
| + ProcessPowerEvent(PowerMonitorSource::SUSPEND_EVENT);
|
| message_loop_.RunUntilIdle();
|
| EXPECT_EQ(test[0].suspends(), 1);
|
|
|
| // Pretend we were awakened.
|
| - ProcessPowerEvent(PowerMonitor::RESUME_EVENT);
|
| + ProcessPowerEvent(PowerMonitorSource::RESUME_EVENT);
|
| message_loop_.RunUntilIdle();
|
| EXPECT_EQ(test[0].resumes(), 1);
|
|
|
| // Send a duplicate resume notification. This should be suppressed.
|
| - ProcessPowerEvent(PowerMonitor::RESUME_EVENT);
|
| + ProcessPowerEvent(PowerMonitorSource::RESUME_EVENT);
|
| message_loop_.RunUntilIdle();
|
| EXPECT_EQ(test[0].resumes(), 1);
|
| }
|
|
|