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

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

Index: third_party/WebKit/LayoutTests/fast/dom/Geolocation/resources/geolocation-mock.js
diff --git a/third_party/WebKit/LayoutTests/fast/dom/Geolocation/resources/geolocation-mock.js b/third_party/WebKit/LayoutTests/fast/dom/Geolocation/resources/geolocation-mock.js
index 836c79d69e1f587a21de25b7a58d80172f77ed62..40b657d80afa99db488a8fc128d1449c98d2abdc 100644
--- a/third_party/WebKit/LayoutTests/fast/dom/Geolocation/resources/geolocation-mock.js
+++ b/third_party/WebKit/LayoutTests/fast/dom/Geolocation/resources/geolocation-mock.js
@@ -10,9 +10,9 @@ let geolocationServiceMock = loadMojoModules(
     ['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/router',
+     'mojo/public/js/bindings',
     ]).then(mojo => {
-  let [geolocation, permission, permissionStatus, router] =
+  let [geolocation, permission, permissionStatus, bindings] =
       mojo.modules;
 
   class GeolocationServiceMock {
@@ -51,6 +51,11 @@ let geolocationServiceMock = loadMojoModules(
       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) {
@@ -58,10 +63,7 @@ let geolocationServiceMock = loadMojoModules(
         mojo.core.close(handle);
         return;
       }
-      this.geolocationStub_ = new geolocation.GeolocationService.stubClass(
-          this);
-      this.geolocationRouter_ = new router.Router(handle);
-      this.geolocationRouter_.setIncomingReceiver(this.geolocationStub_);
+      this.geolocationBindingSet_.addBinding(this, handle);
     }
 
     connectPermission_(handle) {
@@ -69,9 +71,7 @@ let geolocationServiceMock = loadMojoModules(
         mojo.core.close(handle);
         return;
       }
-      this.permissionStub_ = new permission.PermissionService.stubClass(this);
-      this.permissionRouter_ = new router.Router(handle);
-      this.permissionRouter_.setIncomingReceiver(this.permissionStub_);
+      this.permissionBindingSet_.addBinding(this, handle);
     }
 
     setHighAccuracy(highAccuracy) {