Split the power monitoring feature from SystemMonitor

The SystemMonitor is a mixed monitor which not only monitors
the power state changes but also the devices changes. This
patch is to separate the power monitor from SystemMonitor
as a new class PowerMonitor which is dedicated to monitor
power state.

The next step is to seek a opportunity to refactor SystemMonitor
as something like DeviceMonitor.

BUG=149059
TEST=base_unittests --gtest_filter=PowerMonitorTest.*

Review URL: https://chromiumcodereview.appspot.com/10959020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192114 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 5 insertions, 11 deletions

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index e85329f..713cdbf 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -13,6 +13,8 @@
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/pending_task.h"
+#include "base/power_monitor/power_monitor.h"
+#include "base/system_monitor/system_monitor.h"
 #include "base/run_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread_restrictions.h"
@@ -367,6 +369,7 @@ void BrowserMainLoop::MainMessageLoopStart() {
   InitializeMainThread();
 
   system_monitor_.reset(new base::SystemMonitor);
+  power_monitor_.reset(new base::PowerMonitor);
   hi_res_timer_manager_.reset(new HighResolutionTimerManager);
   network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
   audio_manager_.reset(media::AudioManager::Create());
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index 9118309..30442a6 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -14,6 +14,7 @@ class HighResolutionTimerManager;
 
 namespace base {
 class MessageLoop;
+class PowerMonitor;
 class SystemMonitor;
 }
 
@@ -95,6 +96,7 @@ class BrowserMainLoop {
   // Members initialized in |MainMessageLoopStart()| ---------------------------
   scoped_ptr<base::MessageLoop> main_message_loop_;
   scoped_ptr<base::SystemMonitor> system_monitor_;
+  scoped_ptr<base::PowerMonitor> power_monitor_;
   scoped_ptr<HighResolutionTimerManager> hi_res_timer_manager_;
   scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
   scoped_ptr<media::AudioManager> audio_manager_;
diff --git a/content/browser/gamepad/gamepad_test_helpers.cc b/content/browser/gamepad/gamepad_test_helpers.cc
index abf4187..e4db14c 100644
--- a/content/browser/gamepad/gamepad_test_helpers.cc
+++ b/content/browser/gamepad/gamepad_test_helpers.cc
@@ -4,7 +4,6 @@
 
 #include "content/browser/gamepad/gamepad_test_helpers.h"
 
-#include "base/system_monitor/system_monitor.h"
 #include "content/browser/gamepad/gamepad_service.h"
 
 namespace content {
@@ -37,10 +36,6 @@ void MockGamepadDataFetcher::SetTestData(const WebKit::WebGamepads& new_data) {
 }
 
 GamepadTestHelper::GamepadTestHelper() {
-#if defined(OS_MACOSX)
-  base::SystemMonitor::AllocateSystemIOPorts();
-#endif
-  system_monitor_.reset(new base::SystemMonitor);
 }
 
 GamepadTestHelper::~GamepadTestHelper() {
diff --git a/content/browser/gamepad/gamepad_test_helpers.h b/content/browser/gamepad/gamepad_test_helpers.h
index 9abba01..6b97eda 100644
--- a/content/browser/gamepad/gamepad_test_helpers.h
+++ b/content/browser/gamepad/gamepad_test_helpers.h
@@ -12,10 +12,6 @@
 #include "content/browser/gamepad/gamepad_data_fetcher.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGamepads.h"
 
-namespace base {
-class SystemMonitor;
-}
-
 namespace content {
 
 class GamepadService;
@@ -60,8 +56,6 @@ class GamepadTestHelper {
   // This must be constructed before the system monitor.
   MessageLoop message_loop_;
 
-  scoped_ptr<base::SystemMonitor> system_monitor_;
-
   DISALLOW_COPY_AND_ASSIGN(GamepadTestHelper);
 };