Revert of Mojo JS bindings: switch most usage of "connection"/"router" module to "bindings".

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',
+     'mojo/public/js/router',
     ]).then(mojo => {
-  let [batteryMonitor, batteryStatus, bindings] = mojo.modules;
+  let [batteryMonitor, batteryStatus, router] = mojo.modules;
 
-  class MockBatteryMonitor {
+  class MockBatteryMonitor extends batteryMonitor.BatteryMonitor.stubClass {
     constructor(interfaceProvider) {
+      super();
       interfaceProvider.addInterfaceOverrideForTesting(
           batteryMonitor.BatteryMonitor.name,
-          handle => this.bindingSet_.addBinding(this, handle));
+          handle => this.connect_(handle));
 
       this.interfaceProvider_ = interfaceProvider;
       this.pendingRequests_ = [];
       this.status_ = null;
-      this.bindingSet_ = new bindings.BindingSet(batteryMonitor.BatteryMonitor);
+    }
+
+    connect_(handle) {
+      this.router_ = new router.Router(handle);
+      this.router_.setIncomingReceiver(this);
     }
 
     queryNextStatus() {
       let result = new Promise(resolve => this.pendingRequests_.push(resolve));
       this.runCallbacks_();
       return result;
     }
 
     updateBatteryStatus(charging, chargingTime, dischargingTime, level) {
       this.status_ = new batteryStatus.BatteryStatus();
@@ skipping 41 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();