[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 97%
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 c418a8fefcf3c095dc9d4ad7654fb03e86053aa6..fe33e4ba5cbcac8eae9816caa5b7311af7c68025 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
@@ -12,8 +12,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;
 
@@ -25,7 +25,6 @@ import javax.annotation.Nullable;
  * received.
  */
 class BatteryStatusManager {
-
     private static final String TAG = "BatteryStatusManager";
 
     interface BatteryStatusCallback {
@@ -169,8 +168,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(