Battery Status API: add plumbing for multi-platform support.

content/browser/battery_status/battery_status_manager_android.cc

Index: content/browser/battery_status/battery_status_manager_android.cc
diff --git a/content/browser/battery_status/battery_status_manager_android.cc b/content/browser/battery_status/battery_status_manager_android.cc
index e7769ca2baa940011d64d3e256246f8d68889d62..ee07c20b061a07b9a3bf5f5aa511228f24079f23 100644
--- a/content/browser/battery_status/battery_status_manager_android.cc
+++ b/content/browser/battery_status/battery_status_manager_android.cc
@@ -2,9 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/battery_status/battery_status_manager_android.h"
-
-#include <string.h>
+#include "content/browser/battery_status/battery_status_manager.h"
 
 #include "base/android/jni_android.h"
 #include "jni/BatteryStatusManager_jni.h"
@@ -13,33 +11,34 @@ using base::android::AttachCurrentThread;
 
 namespace content {
 
-BatteryStatusManagerAndroid::BatteryStatusManagerAndroid() {
+BatteryStatusManager::BatteryStatusManager(
+    const BatteryStatusUpdateCallback& callback) : callback_(callback) {
   j_manager_.Reset(
       Java_BatteryStatusManager_getInstance(
           AttachCurrentThread(), base::android::GetApplicationContext()));
 }
 
-BatteryStatusManagerAndroid::~BatteryStatusManagerAndroid() {
+BatteryStatusManager::~BatteryStatusManager() {
   StopListeningBatteryChange();
 }
 
-bool BatteryStatusManagerAndroid::Register(JNIEnv* env) {
+bool BatteryStatusManager::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
-void BatteryStatusManagerAndroid::GotBatteryStatus(JNIEnv*, jobject,
+void BatteryStatusManager::GotBatteryStatus(JNIEnv*, jobject,
     jboolean charging, jdouble chargingTime, jdouble dischargingTime,
     jdouble level) {
   NOTIMPLEMENTED();
 }
 
-bool BatteryStatusManagerAndroid::StartListeningBatteryChange() {
+bool BatteryStatusManager::StartListeningBatteryChange() {
   return Java_BatteryStatusManager_start(
       AttachCurrentThread(), j_manager_.obj(),
       reinterpret_cast<intptr_t>(this));
 }
 
-void BatteryStatusManagerAndroid::StopListeningBatteryChange() {
+void BatteryStatusManager::StopListeningBatteryChange() {
   Java_BatteryStatusManager_stop(
       AttachCurrentThread(), j_manager_.obj());
 }