Created multi-process-friendly PowerMonitor interface.

base/power_monitor/power_monitor_android.cc

Index: base/power_monitor/power_monitor_android.cc
diff --git a/base/power_monitor/power_monitor_android.cc b/base/power_monitor/power_monitor_android.cc
index 4900f6c7dcc0a9e42fc31a0ca8b24ff7de55a4a3..917281ba6c1e2bda3fb0e2d9eb1059fd76f68e7e 100644
--- a/base/power_monitor/power_monitor_android.cc
+++ b/base/power_monitor/power_monitor_android.cc
@@ -2,35 +2,36 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/power_monitor/power_monitor.h"
+#include "base/power_monitor/power_monitor_device_source.h"
+#include "base/power_monitor/power_monitor_source.h"
 #include "jni/PowerMonitor_jni.h"
 
 namespace base {
 
 // A helper function which is a friend of PowerMonitor.

[vandebo (ex-Chrome), 2013/06/26 21:40:33]

nit: ...friend of PowerMonitorSource.

-void ProcessPowerEventHelper(PowerMonitor::PowerEvent event) {
+void ProcessPowerEventHelper(PowerMonitorSource::PowerEvent event) {
   if (base::PowerMonitor::Get())
-    base::PowerMonitor::Get()->ProcessPowerEvent(event);
+    base::PowerMonitor::Get()->Source()->ProcessPowerEvent(event);
 }
 
 namespace android {
 
 // Native implementation of PowerMonitor.java.
 void OnBatteryChargingChanged(JNIEnv* env, jclass clazz) {
-  ProcessPowerEventHelper(PowerMonitor::POWER_STATE_EVENT);
+  ProcessPowerEventHelper(PowerMonitorSource::POWER_STATE_EVENT);
 }
 
 void OnMainActivityResumed(JNIEnv* env, jclass clazz) {
-  ProcessPowerEventHelper(PowerMonitor::RESUME_EVENT);
+  ProcessPowerEventHelper(PowerMonitorSource::RESUME_EVENT);
 }
 
 void OnMainActivitySuspended(JNIEnv* env, jclass clazz) {
-  ProcessPowerEventHelper(PowerMonitor::SUSPEND_EVENT);
+  ProcessPowerEventHelper(PowerMonitorSource::SUSPEND_EVENT);
 }
 
 }  // namespace android
 
-bool PowerMonitor::IsBatteryPower() {
+bool PowerMonitorDeviceSource::IsBatteryPower() {
   JNIEnv* env = base::android::AttachCurrentThread();
   return base::android::Java_PowerMonitor_isBatteryPower(env);
 }