SystemMonitor refactoring: move power state monitor into a separate class called PowerMonitor

base/power_monitor/power_monitor_android.cc

Index: base/power_monitor/power_monitor_android.cc
diff --git a/base/system_monitor/system_monitor_android.cc b/base/power_monitor/power_monitor_android.cc
similarity index 66%
rename from base/system_monitor/system_monitor_android.cc
rename to base/power_monitor/power_monitor_android.cc
index 4e1a16b3e91f379f26bd829b55f62f08ca9cba46..a704c433e65c053b3f2edcb3a21e66e1e2fa4b40 100644
--- a/base/system_monitor/system_monitor_android.cc
+++ b/base/power_monitor/power_monitor_android.cc
@@ -2,27 +2,32 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/system_monitor/system_monitor.h"
+#include "base/power_monitor/power_monitor.h"
 #include "jni/SystemMonitor_jni.h"
 
 namespace base {
 
+static PowerMonitor::Signaler* g_power_signaler = NULL;

[vandebo (ex-Chrome), 2012/10/29 18:04:38]

This should go in an anonymous namespace.

[Hongbo Min, 2012/10/30 14:33:47]

Done.

+
 namespace android {
 
 // Native implementation of SystemMonitor.java.
 void OnBatteryChargingChanged(JNIEnv* env,
                               jclass clazz) {
-  SystemMonitor::Get()->ProcessPowerMessage(SystemMonitor::POWER_STATE_EVENT);
+  CHECK(g_power_signaler);
+  g_power_signaler->ProcessPowerEvent(PowerMonitor::POWER_STATE_EVENT);
 }
 
 }  // namespace android
 
-bool SystemMonitor::IsBatteryPower() {
+bool PowerMonitor::IsBatteryPower() {
   JNIEnv* env = base::android::AttachCurrentThread();
   return base::android::Java_SystemMonitor_isBatteryPower(env);
 }
 
 bool RegisterSystemMonitor(JNIEnv* env) {
+  CHECK(!g_power_signaler);
+  g_power_signaler = PowerMonitor::Get()->GetSignalerOnce();
   return base::android::RegisterNativesImpl(env);
 }