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

chrome/browser/resources/bluetooth_internals/adapter_broker.js

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * Javascript for AdapterBroker, served from
  *     chrome://bluetooth-internals/.
  */
 cr.define('adapter_broker', function() {
   /**
    * The proxy class of an adapter and router of adapter events.
    * Exposes an EventTarget interface that allows other object to subscribe to
    * to specific AdapterClient events.
    * Provides proxy access to Adapter functions. Converts parameters to Mojo
    * handles and back when necessary.
    * @constructor
    * @extends {cr.EventTarget}
-   * @param {!interfaces.BluetoothAdapter.AdapterPtr} adapter
+   * @param {!interfaces.BluetoothAdapter.Adapter.proxyClass} adapter
    */
   var AdapterBroker = function(adapter) {
     this.adapter_ = adapter;
     this.adapterClient_ = new AdapterClient(this);
     this.setClient(this.adapterClient_);
   };
 
   AdapterBroker.prototype = {
     __proto__: cr.EventTarget.prototype,
 
     /**
      * Creates a GATT connection to the device with |address|.
      * @param {string} address
-     * @return {!Promise<!interfaces.BluetoothDevice.DevicePtr>}
+     * @return {!Promise<!interfaces.BluetoothDevice.Device.proxyClass>}
      */
     connectToDevice: function(address) {
       return this.adapter_.connectToDevice(address).then(function(response) {
         if (response.result !=
             interfaces.BluetoothAdapter.ConnectResult.SUCCESS) {
           // TODO(crbug.com/663394): Replace with more descriptive error
           // messages.
           var ConnectResult = interfaces.BluetoothAdapter.ConnectResult;
           var errorString = Object.keys(ConnectResult).find(function(key) {
             return ConnectResult[key] === response.result;
           });
 
           throw new Error(errorString);
         }
 
-        return response.device;
+        return interfaces.Connection.bindHandleToProxy(
+            response.device.ptr.passInterface().handle,
+            interfaces.BluetoothDevice.Device);
       });
     },
 
     /**
      * Sets client of Adapter service.
      * @param {!interfaces.BluetoothAdapter.AdapterClient} adapterClient
      */
     setClient: function(adapterClient) {
       adapterClient.binding = new interfaces.Bindings.Binding(
           interfaces.BluetoothAdapter.AdapterClient,
@@ skipping 77 matching lines @@
 
   /**
    * Initializes an AdapterBroker if one doesn't exist.
    * @return {!Promise<!AdapterBroker>} resolves with AdapterBroker,
    *     rejects if Bluetooth is not supported.
    */
   function getAdapterBroker() {
     if (adapterBroker) return Promise.resolve(adapterBroker);
 
     return interfaces.setupInterfaces().then(function(adapter) {
-      var adapterFactory = new interfaces.BluetoothAdapter.AdapterFactoryPtr(
+      // Hook up the instance properties.
+      AdapterClient.prototype.__proto__ =
+          interfaces.BluetoothAdapter.AdapterClient.stubClass.prototype;
+
+      var adapterFactory = interfaces.Connection.bindHandleToProxy(
           interfaces.FrameInterfaces.getInterface(
-              interfaces.BluetoothAdapter.AdapterFactory.name));
+              interfaces.BluetoothAdapter.AdapterFactory.name),
+          interfaces.BluetoothAdapter.AdapterFactory);
 
       // Get an Adapter service.
       return adapterFactory.getAdapter();
     }).then(function(response) {
       if (!response.adapter.ptr.isBound()) {
         throw new Error('Bluetooth Not Supported on this platform.');
       }
 
-      adapterBroker = new AdapterBroker(response.adapter);
+      var adapter = interfaces.Connection.bindHandleToProxy(
+          response.adapter.ptr.passInterface().handle,
+          interfaces.BluetoothAdapter.Adapter);
+
+      adapterBroker = new AdapterBroker(adapter);
       return adapterBroker;
     });
   }
 
   return {
     getAdapterBroker: getAdapterBroker,
   };
 });