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

extensions/renderer/resources/media_router_bindings.js

Index: extensions/renderer/resources/media_router_bindings.js
diff --git a/extensions/renderer/resources/media_router_bindings.js b/extensions/renderer/resources/media_router_bindings.js
index 0373e0363e0e92375d7bf5ee5d1a4306d18261f1..40ebfab89206f9cb20cf4d22155484adee65d313 100644
--- a/extensions/renderer/resources/media_router_bindings.js
+++ b/extensions/renderer/resources/media_router_bindings.js
@@ -5,16 +5,22 @@
 var mediaRouter;
 
 define('media_router_bindings', [
+    'mojo/public/js/bindings',
+    'mojo/public/js/core',
     'content/public/renderer/frame_interfaces',
     'chrome/browser/media/router/mojo/media_router.mojom',
     'extensions/common/mojo/keep_alive.mojom',
     'mojo/common/time.mojom',
-    'mojo/public/js/bindings',
-], function(frameInterfaces,
+    'mojo/public/js/connection',
+    'mojo/public/js/router',
+], function(bindings,
+            core,
+            frameInterfaces,
             mediaRouterMojom,
             keepAliveMojom,
             timeMojom,
-            bindings) {
+            connector,
+            routerModule) {
   'use strict';
 
   /**
@@ -181,14 +187,14 @@
   /**
    * Creates a new MediaRouter.
    * Converts a route struct to its Mojo form.
-   * @param {!mediaRouterMojom.MediaRouterPtr} service
+   * @param {!MediaRouterService} service
    * @constructor
    */
   function MediaRouter(service) {
     /**
      * The Mojo service proxy. Allows extension code to call methods that reside
      * in the browser.
-     * @type {!mediaRouterMojom.MediaRouterPtr}
+     * @type {!MediaRouterService}
      */
     this.service_ = service;
 
@@ -281,10 +287,10 @@
    */
   MediaRouter.prototype.setKeepAlive = function(keepAlive) {
     if (keepAlive === false && this.keepAlive_) {
-      this.keepAlive_.ptr.reset();
+      this.keepAlive_.close();
       this.keepAlive_ = null;
     } else if (keepAlive === true && !this.keepAlive_) {
-      this.keepAlive_ = new keepAliveMojom.KeepAlivePtr(
+      this.keepAlive_ = new routerModule.Router(
           frameInterfaces.getInterface(keepAliveMojom.KeepAlive.name));
     }
   };
@@ -492,6 +498,8 @@
    * @constructor
    */
   function MediaRouteProvider(mediaRouter) {
+    mediaRouterMojom.MediaRouteProvider.stubClass.call(this);
+
     /**
      * Object containing JS callbacks into Provider Manager code.
      * @type {!MediaRouterHandlers}
@@ -504,6 +512,8 @@
      */
     this.mediaRouter_ = mediaRouter;
   }
+  MediaRouteProvider.prototype = Object.create(
+      mediaRouterMojom.MediaRouteProvider.stubClass.prototype);
 
   /*
    * Sets the callback handler used to invoke methods in the provider manager.
@@ -803,8 +813,9 @@
     });
   };
 
-  mediaRouter = new MediaRouter(new mediaRouterMojom.MediaRouterPtr(
-      frameInterfaces.getInterface(mediaRouterMojom.MediaRouter.name)));
+  mediaRouter = new MediaRouter(connector.bindHandleToProxy(
+      frameInterfaces.getInterface(mediaRouterMojom.MediaRouter.name),
+      mediaRouterMojom.MediaRouter));
 
   return mediaRouter;
 });