[DeviceService] Expose battery monitoring solely via the Device Service

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

Index: services/device/battery/android/java/src/org/chromium/device/battery/BatteryMonitorImpl.java
diff --git a/device/battery/android/java/src/org/chromium/device/battery/BatteryMonitorImpl.java b/services/device/battery/android/java/src/org/chromium/device/battery/BatteryMonitorImpl.java
similarity index 92%
rename from device/battery/android/java/src/org/chromium/device/battery/BatteryMonitorImpl.java
rename to services/device/battery/android/java/src/org/chromium/device/battery/BatteryMonitorImpl.java
index 907e516702779feef09bec4dc5f59360475fe6f6..f06240be418e912649cd77e3f2d6433be28d1862 100644
--- a/device/battery/android/java/src/org/chromium/device/battery/BatteryMonitorImpl.java
+++ b/services/device/battery/android/java/src/org/chromium/device/battery/BatteryMonitorImpl.java
@@ -4,18 +4,16 @@
 
 package org.chromium.device.battery;
 
-import android.util.Log;
-
+import org.chromium.base.Log;
 import org.chromium.device.mojom.BatteryMonitor;
 import org.chromium.device.mojom.BatteryStatus;
 import org.chromium.mojo.system.MojoException;
 
 /**
- * Android implementation of the battery monitor service defined in
- * device/battery/battery_monitor.mojom.
+ * Android implementation of the battery monitor interface defined in
+ * services/device/public/interfaces/battery_monitor.mojom.
  */
 public class BatteryMonitorImpl implements BatteryMonitor {
-
     private static final String TAG = "BatteryMonitorImpl";
 
     // Factory that created this instance and notifies it about battery status changes.