[DeviceService] Expose battery monitoring solely via the Device Service

services/device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java

Index: services/device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java
diff --git a/device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java b/services/device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java
similarity index 95%
rename from device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java
rename to services/device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java
index 0f9db8de19595e7891deef6a27e372fec577a741..391252234025b5e7167ae596ae0ad6b693771a5f 100644
--- a/device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java
+++ b/services/device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java
@@ -11,8 +11,8 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.BatteryManager;
 import android.os.Build;
-import android.util.Log;
 
+import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.device.mojom.BatteryStatus;
 
@@ -24,7 +24,6 @@ import javax.annotation.Nullable;
  * received.
  */
 class BatteryStatusManager {
-
     private static final String TAG = "BatteryStatusManager";
 
     interface BatteryStatusCallback {
@@ -77,8 +76,8 @@ class BatteryStatusManager {
         // Android 4.2.1, it always reports false. See http://crbug.com/384348.
         this(context, callback, Build.MODEL.equals("Galaxy Nexus"),
                 Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
-                        ? new AndroidBatteryManagerWrapper(
-                                (BatteryManager) context.getSystemService(Context.BATTERY_SERVICE))
+                        ? new AndroidBatteryManagerWrapper((

[timvolodine, 2017/05/02 18:19:04]

"(" is very weird, can you put it so it's clear it's a cast?

[leonhsl(Using Gerrit), 2017/05/03 03:07:02]

Done. We did not change here, it's caused by 'git cl format'..

+                                  BatteryManager) context.getSystemService(Context.BATTERY_SERVICE))
                         : null);
     }
 
@@ -167,8 +166,9 @@ class BatteryStatusManager {
         assert mAndroidBatteryManager != null;
 
         // On Lollipop we can provide a better estimate for chargingTime and dischargingTime.
-        double remainingCapacityRatio = mAndroidBatteryManager.getIntProperty(
-                BatteryManager.BATTERY_PROPERTY_CAPACITY) / 100.0;
+        double remainingCapacityRatio =
+                mAndroidBatteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
+                / 100.0;
         double batteryCapacityMicroAh = mAndroidBatteryManager.getIntProperty(
                 BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER);
         double averageCurrentMicroA = mAndroidBatteryManager.getIntProperty(