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

third_party/WebKit/LayoutTests/media/mediasession/mojo/resources/mediasessionservice-mock.js

Index: third_party/WebKit/LayoutTests/media/mediasession/mojo/resources/mediasessionservice-mock.js
diff --git a/third_party/WebKit/LayoutTests/media/mediasession/mojo/resources/mediasessionservice-mock.js b/third_party/WebKit/LayoutTests/media/mediasession/mojo/resources/mediasessionservice-mock.js
index 963e40e0ea54420c655f5b31aef76ca54089475d..2a73642973109c1ceb3ad19deacc377c2de70fb3 100644
--- a/third_party/WebKit/LayoutTests/media/mediasession/mojo/resources/mediasessionservice-mock.js
+++ b/third_party/WebKit/LayoutTests/media/mediasession/mojo/resources/mediasessionservice-mock.js
@@ -42,9 +42,9 @@
 let mediaSessionServiceMock = loadMojoModules(
     'mediaSessionServiceMock',
     ['third_party/WebKit/public/platform/modules/mediasession/media_session.mojom',
-     'mojo/public/js/bindings',
+     'mojo/public/js/router',
     ]).then(mojo => {
-      let [mediaSessionService, bindings] = mojo.modules;
+      let [mediaSessionService, router] = mojo.modules;
 
       MediaSessionAction = mediaSessionService.MediaSessionAction;
       MediaSessionPlaybackState = mediaSessionService.MediaSessionPlaybackState;
@@ -53,11 +53,15 @@
         constructor(interfaceProvider) {
           interfaceProvider.addInterfaceOverrideForTesting(
               mediaSessionService.MediaSessionService.name,
-              handle => this.bindingSet_.addBinding(this, handle));
+              handle => this.connectMediaSessionService_(handle));
           this.interfaceProvider_ = interfaceProvider;
           this.pendingResponse_ = null;
-          this.bindingSet_ = new bindings.BindingSet(
-              mediaSessionService.MediaSessionService);
+        }
+
+        connectMediaSessionService_(handle) {
+          this.mediaSessionServiceStub_ = new mediaSessionService.MediaSessionService.stubClass(this);
+          this.mediaSessionServiceRouter_ = new router.Router(handle);
+          this.mediaSessionServiceRouter_.setIncomingReceiver(this.mediaSessionServiceStub_);
         }
 
         setMetadata(metadata) {