Chromium Code Reviews| Index: base/hi_res_timer_manager_unittest.cc |
| diff --git a/base/hi_res_timer_manager_unittest.cc b/base/hi_res_timer_manager_unittest.cc |
| index 07651ce27444d6e868b0c28887e3374ed8d63d47..ec5dd7af8543715edbe112ebfebebc7185932c8c 100644 |
| --- a/base/hi_res_timer_manager_unittest.cc |
| +++ b/base/hi_res_timer_manager_unittest.cc |
| @@ -5,7 +5,7 @@ |
| #include "base/hi_res_timer_manager.h" |
| #include "base/memory/scoped_ptr.h" |
| -#include "base/system_monitor/system_monitor.h" |
| +#include "base/power_monitor/power_monitor.h" |
| #include "base/time.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| @@ -13,12 +13,13 @@ |
| // http://crbug.com/114048 |
| TEST(HiResTimerManagerTest, DISABLED_ToggleOnOff) { |
| MessageLoop loop; |
| - scoped_ptr<base::SystemMonitor> system_monitor(new base::SystemMonitor()); |
| + scoped_ptr<base::PowerMonitor> system_monitor( |
|
vandebo (ex-Chrome)
2012/10/11 00:58:43
system_monitor -> power_monitor
Hongbo Min
2012/10/11 07:57:53
Done.
|
| + new base::PowerMonitor()); |
| HighResolutionTimerManager manager; |
| // At this point, we don't know if the high resolution timers are on or off, |
| // it depends on what system the tests are running on (for example, if this |
| - // test is running on a laptop/battery, then the SystemMonitor would have |
| + // test is running on a laptop/battery, then the PowerMonitor would have |
| // already set the PowerState to battery power; but if we're running on a |
| // desktop, then the PowerState will be non-battery power). Simulate a power |
| // level change to get to a deterministic state. |