[Presentation API] Change ListenForSessionMessages API to client-style.

extensions/renderer/resources/media_router_bindings.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 var mediaRouter;
 
 define('media_router_bindings', [
     'mojo/public/js/bindings',
     'mojo/public/js/core',
     'content/public/renderer/service_provider',
@@ skipping 45 matching lines @@
   }
 
   /**
    * Converts a route message to a RouteMessage Mojo object.
    * @param {!RouteMessage} message
    * @return {!mediaRouterMojom.RouteMessage} A Mojo RouteMessage object.
    */
   function messageToMojo_(message) {
     if ("string" == typeof message.message) {
       return new mediaRouterMojom.RouteMessage({
-        'route_id': message.routeId,
         'type': mediaRouterMojom.RouteMessage.Type.TEXT,
         'message': message.message,
       });
     } else {
       return new mediaRouterMojom.RouteMessage({
-        'route_id': message.routeId,
         'type': mediaRouterMojom.RouteMessage.Type.BINARY,
         'data': message.message,
       });
     }
   }
 
   /**
    * Creates a new MediaRouter.
    * Converts a route struct to its Mojo form.
    * @param {!MediaRouterService} service
@@ skipping 227 matching lines @@
      * @type {function(string)}
      */
     this.stopObservingMediaSinks = null;
 
     /**
      * @type {function(string, string): Promise}
      */
     this.sendRouteMessage = null;
 
     /**
-     * @type {function(Array.<string>): Promise.<Array.<RouteMessage>>}
+     * @type {function(string): Promise.<Array.<RouteMessage>>}
      */
     this.listenForRouteMessages = null;
 
     /**
      * @type {function()}
      */
     this.startObservingMediaRoutes = null;
 
     /**
      * @type {function()}
@@ skipping 143 matching lines @@
     return this.handlers_.sendRouteMessage(routeId, message)
         .then(function() {
           return {'sent': true};
         }, function() {
           return {'sent': false};
         });
   };
 
   /**
    * Listen for next batch of messages from one of the routeIds.
-   * @param {!Array.<string>} routeIds
+   * @param {!string} routeId
    * @return {!Promise.<Array.<RouteMessage>>} Resolved with a list of messages,
    *    an empty list if an error occurred.
    */
-  MediaRouteProvider.prototype.listenForRouteMessages = function(routeIds) {
-    return this.handlers_.listenForRouteMessages(routeIds)
+  MediaRouteProvider.prototype.listenForRouteMessages = function(routeId) {
+    return this.handlers_.listenForRouteMessages([routeId])
         .then(function(messages) {
           return {'messages': messages.map(messageToMojo_)};
         }, function() {
           return {'messages': []};
         });
   };
 
   /**
    * Requests that the provider manager start sending information about active
    * media routes to the Media Router.
@@ skipping 11 matching lines @@
   };
 
   mediaRouter = new MediaRouter(connector.bindHandleToProxy(
       serviceProvider.connectToService(
           mediaRouterMojom.MediaRouter.name),
       mediaRouterMojom.MediaRouter));
 
   return mediaRouter;
 });