Stop using [Client=...] feature of Mojom for BatteryMonitor

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

Index: 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/device/battery/android/java/src/org/chromium/device/battery/BatteryMonitorImpl.java
index e44158912644a43af4c2c4aaeb1f88e6cd139517..ce4055427d2ea2992d2eb0475d04053d70e236c0 100644
--- a/device/battery/android/java/src/org/chromium/device/battery/BatteryMonitorImpl.java
+++ b/device/battery/android/java/src/org/chromium/device/battery/BatteryMonitorImpl.java
@@ -6,8 +6,8 @@ package org.chromium.device.battery;
 
 import org.chromium.mojo.system.MojoException;
 import org.chromium.mojom.device.BatteryMonitor;
+import org.chromium.mojom.device.BatteryMonitorClient;
 import org.chromium.mojom.device.BatteryStatus;
-import org.chromium.mojom.device.BatteryStatusObserver;
 
 /**
  * Android implementation of the battery monitor service defined in
@@ -18,7 +18,7 @@ public class BatteryMonitorImpl implements BatteryMonitor {
     private final BatteryMonitorFactory mFactory;
     private boolean mSubscribed;
 
-    private BatteryStatusObserver mClient;
+    private BatteryMonitorClient mClient;
 
     public BatteryMonitorImpl(BatteryMonitorFactory batteryMonitorFactory) {
         mFactory = batteryMonitorFactory;
@@ -33,11 +33,6 @@ public class BatteryMonitorImpl implements BatteryMonitor {
     }
 
     @Override
-    public void setClient(BatteryStatusObserver client) {
-        mClient = client;
-    }
-
-    @Override
     public void close() {
         unsubscribe();
     }
@@ -47,6 +42,11 @@ public class BatteryMonitorImpl implements BatteryMonitor {
         unsubscribe();
     }
 
+    @Override
+    public void setClient(BatteryMonitorClient client) {
+        mClient = client;
+    }
+
     /**
      * Notifies the client passing the given battery status information.
      */