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

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 40b657d80afa99db488a8fc128d1449c98d2abdc..836c79d69e1f587a21de25b7a58d80172f77ed62 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 @@
     ['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 {
@@ -51,11 +51,6 @@
       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) {
@@ -63,7 +58,10 @@
         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) {
@@ -71,7 +69,9 @@
         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) {