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

chrome/test/data/webui/plugins_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://plugins
  */
 
 /** @const {string} Path to source root. */
 var ROOT_PATH = '../../../../';
@@ skipping 37 matching lines @@
      * @constructor
      * @extends {TestBrowserProxyBase}
      */
     var TestBrowserProxy = function() {
       settings.TestBrowserProxy.call(this, [
         'getPluginsData',
         'getShowDetails',
         'saveShowDetailsToPrefs',
       ]);
 
-      this.bindingSet = null;
-
       /**
        * The data to be returned by |getPluginsData_|.
        * @private
        */
       this.pluginsData_ = [];
     };
 
     TestBrowserProxy.prototype = {
       __proto__: settings.TestBrowserProxy.prototype,
 
@@ skipping 21 matching lines @@
     };
 
     this.browserProxy = new TestBrowserProxy();
 
     // A function that is called from chrome://plugins 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([
         'mojo/public/js/bindings',
+        'mojo/public/js/connection',
         'chrome/browser/ui/webui/plugins/plugins.mojom',
         'content/public/renderer/frame_interfaces',
       ]).then(function(modules) {
         var bindings = modules[0];
-        var pluginsMojom = modules[1];
-        var frameInterfaces = modules[2];
+        var connection = modules[1];
+        var pluginsMojom = modules[2];
+        var frameInterfaces = modules[3];
 
-        this.browserProxy.bindingSet = new bindings.BindingSet(
-            pluginsMojom.PluginsPageHandler);
         frameInterfaces.addInterfaceOverrideForTesting(
             pluginsMojom.PluginsPageHandler.name, function(handle) {
-              this.browserProxy.bindingSet.addBinding(this.browserProxy,
-                                                      handle);
+              var stub = connection.bindHandleToStub(
+                  handle, pluginsMojom.PluginsPageHandler);
+              bindings.StubBindings(stub).delegate = this.browserProxy;
             }.bind(this));
         return this.setupFnResolver.promise;
       }.bind(this));
     }.bind(this);
   },
 };
 
 TEST_F('PluginsTest', 'Plugins', function() {
   var browserProxy = this.browserProxy;
   var setupFnResolver = this.setupFnResolver;
@@ skipping 83 matching lines @@
             return browserProxy.whenCalled('saveShowDetailsToPrefs');
           }).then(function(expanded) {
             assertFalse(Boolean(expanded));
           });
     });
   });
 
   // Run all registered tests.
   mocha.run();
 });