Port BatteryMonitor into Device Service

third_party/WebKit/LayoutTests/battery-status/resources/mock-battery-monitor.js

 "use strict";
 
-let mockBatteryMonitor = loadMojoModules(
-    'mockBatteryMonitor',
-    ['device/battery/battery_monitor.mojom',
-     'device/battery/battery_status.mojom',
-     'mojo/public/js/bindings',
-    ]).then(mojo => {
-  let [batteryMonitor, batteryStatus, bindings] = mojo.modules;
+let mockBatteryMonitor = loadMojoModules('mockBatteryMonitor', [
+                           'device/battery/battery_monitor.mojom',
+                           'device/battery/battery_status.mojom',
+                           'services/device/public/interfaces/constants.mojom',
+                           'mojo/public/js/bindings',
+                         ]).then(mojo => {
+  let [batteryMonitor, batteryStatus, deviceConstants, bindings] = mojo.modules;
 
   class MockBatteryMonitor {
-    constructor(interfaceProvider) {
-      interfaceProvider.addInterfaceOverrideForTesting(
-          batteryMonitor.BatteryMonitor.name,
+    constructor(connector) {
+      connector.addInterfaceOverrideForTesting(
+          deviceConstants.kServiceName, batteryMonitor.BatteryMonitor.name,
           handle => this.bindingSet_.addBinding(this, handle));
 
-      this.interfaceProvider_ = interfaceProvider;
       this.pendingRequests_ = [];
       this.status_ = null;
       this.bindingSet_ = new bindings.BindingSet(batteryMonitor.BatteryMonitor);
     }
 
     queryNextStatus() {
       let result = new Promise(resolve => this.pendingRequests_.push(resolve));
       this.runCallbacks_();
       return result;
     }
@@ skipping 10 matching lines @@
     runCallbacks_() {
       if (!this.status_ || !this.pendingRequests_.length)
         return;
 
       while (this.pendingRequests_.length) {
         this.pendingRequests_.pop()({status: this.status_});
       }
       this.status_ = null;
     }
   }
-  return new MockBatteryMonitor(mojo.interfaces);
+  return new MockBatteryMonitor(mojo.connector);
 });
 
 let batteryInfo;
 let lastSetMockBatteryInfo;
 
 function setAndFireMockBatteryInfo(charging, chargingTime, dischargingTime,
                                    level) {
   lastSetMockBatteryInfo = { charging: charging,
                       chargingTime: chargingTime,
                       dischargingTime: dischargingTime,
@@ skipping 13 matching lines @@
            'lastSetMockBatteryInfo.dischargingTime');
   shouldBe('batteryInfo.level', 'lastSetMockBatteryInfo.level');
 }
 
 function batteryStatusFailure() {
   testFailed('failed to successfully resolve the promise');
   setTimeout(finishJSTest, 0);
 }
 
 var mockBatteryMonitorReady = mockBatteryMonitor.then();