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

chrome/test/data/webui/bluetooth_internals_browsertest.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.
 
 /**
  * @fileoverview Tests for chrome://bluetooth-internals
  */
 
 /** @const {string} Path to source root. */
 var ROOT_PATH = '../../../../';
@@ skipping 33 matching lines @@
   preLoad: function() {
     // A function that is called from chrome://bluetooth-internals to allow this
     // test to replace the real Mojo browser proxy with a fake one, before any
     // other code runs.
     window.setupFn = function() {
       return importModules([
         'content/public/renderer/frame_interfaces',
         'device/bluetooth/public/interfaces/adapter.mojom',
         'device/bluetooth/public/interfaces/device.mojom',
         'mojo/public/js/bindings',
-      ]).then(function([frameInterfaces, adapter, device, bindings]) {
+        'mojo/public/js/connection',
+      ]).then(function([frameInterfaces, adapter, device, bindings,
+          connection]) {
         /**
           * A test adapter factory proxy for the chrome://bluetooth-internals
           * page.
           *
           * @constructor
           * @extends {TestBrowserProxyBase}
           */
         var TestAdapterFactoryProxy = function() {
           settings.TestBrowserProxy.call(this, [
             'getAdapter',
           ]);
 
-          this.binding = new bindings.Binding(adapter.AdapterFactory, this);
           this.adapter = new TestAdapter();
           this.adapterBinding_ = new bindings.Binding(adapter.Adapter,
                                                       this.adapter);
         };
 
         TestAdapterFactoryProxy.prototype = {
           __proto__: settings.TestBrowserProxy.prototype,
           getAdapter: function() {
             this.methodCalled('getAdapter');
 
             // Create message pipe bound to TestAdapter.
             return Promise.resolve({
               adapter: this.adapterBinding_.createInterfacePtrAndBind(),
             });
           }
         };
 
         /**
           * A test adapter for the chrome://bluetooth-internals page.
           * Must be used to create message pipe handle from test code.
           *
           * @constructor
+          * @extends {adapter.Adapter.stubClass}
           */
         var TestAdapter = function() {
           this.proxy = new TestAdapterProxy();
         };
 
         TestAdapter.prototype = {
+          __proto__: adapter.Adapter.stubClass.prototype,
           getInfo: function() { return this.proxy.getInfo(); },
           getDevices: function() { return this.proxy.getDevices(); },
           setClient: function(client) { return this.proxy.setClient(client); }
         };
 
         /**
           * A test adapter proxy for the chrome://bluetooth-internals page.
           *
           * @constructor
           * @extends {TestBrowserProxyBase}
@@ skipping 30 matching lines @@
             this.adapterInfo_ = adapterInfo;
           },
 
           setTestDevices: function(devices) {
             this.devices_ = devices;
           }
         };
 
         frameInterfaces.addInterfaceOverrideForTesting(
             adapter.AdapterFactory.name, function(handle) {
+              var stub = connection.bindHandleToStub(
+                  handle, adapter.AdapterFactory);
+
               this.adapterFactory = new TestAdapterFactoryProxy();
-              this.adapterFactory.binding.bind(handle);
 
               this.adapterFactory.adapter.proxy.setTestDevices([
                 this.fakeDeviceInfo1(),
                 this.fakeDeviceInfo2(),
               ]);
               this.adapterFactory.adapter.proxy.setTestAdapter(
                   this.fakeAdapterInfo());
 
+              bindings.StubBindings(stub).delegate = this.adapterFactory;
+
               this.setupResolver.resolve();
             }.bind(this));
 
       }.bind(this));
     }.bind(this);
   },
 
   /**
    * Returns a copy of fake adapter info object.
    * @return {!Object}
@@ skipping 290 matching lines @@
       // Multiple calls to close shouldn't change the state.
       sidebarObj.close();
       sidebarObj.close();
       expectFalse(sidebarNode.classList.contains('open'));
     });
   });
 
   // Run all registered tests.
   mocha.run();
 });