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

content/test/data/web_ui_mojo.js

Index: content/test/data/web_ui_mojo.js
diff --git a/content/test/data/web_ui_mojo.js b/content/test/data/web_ui_mojo.js
index adafb0641a91883d6df005dc920f67e02bda7a6d..3591135f18cc3901ecee9251b0e6c5eaabf05e4a 100644
--- a/content/test/data/web_ui_mojo.js
+++ b/content/test/data/web_ui_mojo.js
@@ -3,15 +3,16 @@
 // found in the LICENSE file.
 
 define('main', [
+    'mojo/public/js/router',
+    'content/test/data/web_ui_test_mojo_bindings.mojom',
     'content/public/renderer/frame_interfaces',
-    'content/test/data/web_ui_test_mojo_bindings.mojom',
-    'mojo/public/js/bindings',
-], function (interfaceProvider, webUITest, bindings) {
+], function (router, bindings, interfaceProvider) {
   var browserTarget;
 
   return function() {
-    browserTarget = new webUITest.BrowserTargetPtr(
-        interfaceProvider.getInterface(webUITest.BrowserTarget.name));
+    browserTarget = new bindings.BrowserTarget.proxyClass(
+        new router.Router(
+            interfaceProvider.getInterface(bindings.BrowserTarget.name)));
 
     browserTarget.start().then(function() {
       browserTarget.stop();