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

third_party/WebKit/LayoutTests/fast/dom/Geolocation/resources/geolocation-mock.js

 /*
  * geolocation-mock contains a mock implementation of GeolocationService and
  * PermissionService.
  */
 
 "use strict";
 
 let geolocationServiceMock = loadMojoModules(
     'geolocationServiceMock',
     ['device/geolocation/public/interfaces/geolocation.mojom',
      'third_party/WebKit/public/platform/modules/permissions/permission.mojom',
      'third_party/WebKit/public/platform/modules/permissions/permission_status.mojom',
-     'mojo/public/js/bindings',
+     'mojo/public/js/router',
     ]).then(mojo => {
-  let [geolocation, permission, permissionStatus, bindings] =
+  let [geolocation, permission, permissionStatus, router] =
       mojo.modules;
 
   class GeolocationServiceMock {
     constructor(interfaceProvider) {
       interfaceProvider.addInterfaceOverrideForTesting(
           geolocation.GeolocationService.name,
           handle => this.connectGeolocation_(handle));
 
       interfaceProvider.addInterfaceOverrideForTesting(
           permission.PermissionService.name,
@@ skipping 18 matching lines @@
       /**
        * The status to respond to permission requests with. If set to ASK, then
        * permission requests will block until setGeolocationPermission is called
        * to allow or deny permission requests.
        *
        * @type {!permissionStatus.PermissionStatus}
        */
       this.permissionStatus_ = permissionStatus.PermissionStatus.ASK;
       this.rejectPermissionConnections_ = false;
       this.rejectGeolocationConnections_ = false;
-
-      this.geolocationBindingSet_ = new bindings.BindingSet(
-          geolocation.GeolocationService);
-      this.permissionBindingSet_ = new bindings.BindingSet(
-          permission.PermissionService);
     }
 
     connectGeolocation_(handle) {
       if (this.rejectGeolocationConnections_) {
         mojo.core.close(handle);
         return;
       }
-      this.geolocationBindingSet_.addBinding(this, handle);
+      this.geolocationStub_ = new geolocation.GeolocationService.stubClass(
+          this);
+      this.geolocationRouter_ = new router.Router(handle);
+      this.geolocationRouter_.setIncomingReceiver(this.geolocationStub_);
     }
 
     connectPermission_(handle) {
       if (this.rejectPermissionConnections_) {
         mojo.core.close(handle);
         return;
       }
-      this.permissionBindingSet_.addBinding(this, handle);
+      this.permissionStub_ = new permission.PermissionService.stubClass(this);
+      this.permissionRouter_ = new router.Router(handle);
+      this.permissionRouter_.setIncomingReceiver(this.permissionStub_);
     }
 
     setHighAccuracy(highAccuracy) {
       // FIXME: We need to add some tests regarding "high accuracy" mode.
       // See https://bugs.webkit.org/show_bug.cgi?id=49438
     }
 
     /**
      * A mock implementation of GeolocationService.queryNextPosition(). This
      * returns the position set by a call to setGeolocationPosition() or
@@ skipping 92 matching lines @@
     setGeolocationPermission(allowed) {
       this.permissionStatus_ = allowed ?
           permissionStatus.PermissionStatus.GRANTED :
           permissionStatus.PermissionStatus.DENIED;
       this.runPermissionCallback_();
     }
 
   }
   return new GeolocationServiceMock(mojo.frameInterfaces);
 });