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

chrome/test/data/webui/plugins_browsertest.js

Index: chrome/test/data/webui/plugins_browsertest.js
diff --git a/chrome/test/data/webui/plugins_browsertest.js b/chrome/test/data/webui/plugins_browsertest.js
index 1fc8ac7e3e34a6f18adbddd80c2419765bc2b33f..6f613ea21067c3a9f2718e18118f8925868694fb 100644
--- a/chrome/test/data/webui/plugins_browsertest.js
+++ b/chrome/test/data/webui/plugins_browsertest.js
@@ -55,8 +55,6 @@
         'saveShowDetailsToPrefs',
       ]);
 
-      this.bindingSet = null;
-
       /**
        * The data to be returned by |getPluginsData_|.
        * @private
@@ -98,19 +96,20 @@
     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];
-
-        this.browserProxy.bindingSet = new bindings.BindingSet(
-            pluginsMojom.PluginsPageHandler);
+        var connection = modules[1];
+        var pluginsMojom = modules[2];
+        var frameInterfaces = modules[3];
+
         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));