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

third_party/WebKit/LayoutTests/presentation/resources/presentation-service-mock.js

Index: third_party/WebKit/LayoutTests/presentation/resources/presentation-service-mock.js
diff --git a/third_party/WebKit/LayoutTests/presentation/resources/presentation-service-mock.js b/third_party/WebKit/LayoutTests/presentation/resources/presentation-service-mock.js
index 6df94aa574e1037beb3a420494d3cac2b6b65a48..9b2dbd028368c295776bad6fea7a35384a5e2b49 100644
--- a/third_party/WebKit/LayoutTests/presentation/resources/presentation-service-mock.js
+++ b/third_party/WebKit/LayoutTests/presentation/resources/presentation-service-mock.js
@@ -8,19 +8,23 @@
     'presentationServiceMock',
     [
       'third_party/WebKit/public/platform/modules/presentation/presentation.mojom',
-      'mojo/public/js/bindings',
+      'mojo/public/js/router',
     ]).then(mojo => {
-      let [ presentationService, bindings ] = mojo.modules;
+      let [ presentationService, router ] = mojo.modules;
 
       class PresentationServiceMock {
         constructor(interfaceProvider) {
           interfaceProvider.addInterfaceOverrideForTesting(
               presentationService.PresentationService.name,
-              handle => this.bindingSet_.addBinding(this, handle));
+              handle => this.connectPresentationService_(handle));
           this.interfaceProvider_ = interfaceProvider;
           this.pendingResponse_ = null;
-          this.bindingSet_ = new bindings.BindingSet(
-              presentationService.PresentationService);
+        }
+
+        connectPresentationService_(handle) {
+          this.presentationServiceStub_ = new presentationService.PresentationService.stubClass(this);
+          this.presentationServiceRouter_ = new router.Router(handle);
+          this.presentationServiceRouter_.setIncomingReceiver(this.presentationServiceStub_);
         }
 
         startSession(urls) {