[Media Router] Remove obsolete code and bindings.

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/frame_interfaces',
@@ skipping 247 matching lines @@
    */
   MediaRouter.prototype.getKeepAlive = function() {
     return this.keepAlive_ != null;
   };
 
   /**
    * Called by the provider manager when a sink list for a given source is
    * updated.
    * @param {!string} sourceUrn
    * @param {!Array<!MediaSink>} sinks
-   * @param {Array<string>=} opt_origins
+   * @param {!Array<string>} origins
    */
   MediaRouter.prototype.onSinksReceived = function(sourceUrn, sinks,
-      opt_origins) {
-    // TODO(imcheng): Make origins required in M52+.
+      origins) {
     this.service_.onSinksReceived(sourceUrn, sinks.map(sinkToMojo_),
-        opt_origins || []);
+        origins);
   };
 
   /**
    * Called by the provider manager when a sink is found to notify the MR of the
    * sink's ID. The actual sink will be returned through the normal sink list
    * update process, so this helps the MR identify the search result in the
    * list.
    * @param {string} pseudoSinkId  ID of the pseudo sink that started the
    *     search.
    * @param {string} sinkId ID of the newly-found sink.
@@ skipping 65 matching lines @@
       'secondary_actions': secondaryActions,
       'help_page_id': issue.helpPageId,
       'is_blocking': issue.isBlocking
     }));
   };
 
   /**
    * Called by the provider manager when the set of active routes
    * has been updated.
    * @param {!Array<MediaRoute>} routes The active set of media routes.
-   * @param {string=} opt_sourceUrn The sourceUrn associated with this route
-   *     query. This parameter is optional and can be empty.
-   * @param {Array<string>=} opt_joinableRouteIds The active set of joinable
-   *     media routes. This parameter is optional and can be empty.
+   * @param {string=} sourceUrn The sourceUrn associated with this route
+   *     query.
+   * @param {Array<string>=} joinableRouteIds The active set of joinable
+   *     media routes.
    */
   MediaRouter.prototype.onRoutesUpdated =
-      function(routes, opt_sourceUrn, opt_joinableRouteIds) {
-    // TODO(boetger): This check allows backward compatibility with the Cast SDK
-    // and can be removed when the Cast SDK is updated.
-    if (typeof(opt_sourceUrn) != 'string') {
-      opt_sourceUrn = '';
-    }
-
+      function(routes, sourceUrn = '', joinableRouteIds = []) {
     this.service_.onRoutesUpdated(
         routes.map(routeToMojo_),
-        opt_sourceUrn || '',
-        opt_joinableRouteIds || []);
+        sourceUrn,
+        joinableRouteIds);
   };
 
   /**
    * Called by the provider manager when sink availability has been updated.
    * @param {!mediaRouterMojom.MediaRouter.SinkAvailability} availability
    *     The new sink availability.
    */
   MediaRouter.prototype.onSinkAvailabilityUpdated = function(availability) {
     this.service_.onSinkAvailabilityUpdated(availability);
   };
@@ skipping 68 matching lines @@
      * @type {function(string, string): Promise}
      */
     this.sendRouteMessage = null;
 
     /**
      * @type {function(string, Uint8Array): Promise}
      */
     this.sendRouteBinaryMessage = null;
 
     /**
-     * TODO(imcheng): Remove in M55 (crbug.com/626395).
-     * @type {function(string):
-     *     Promise.<{messages: Array.<RouteMessage>, error: boolean}>}
-     */
-    this.listenForRouteMessages = null;
-
-    /**
      * @type {function(string)}
      */
     this.startListeningForRouteMessages = null;
 
     /**
      * @type {function(string)}
      */
     this.stopListeningForRouteMessages = null;
 
     /**
@@ skipping 214 matching lines @@
 
   /**
    * Terminates the route specified by |routeId|.
    * @param {!string} routeId
    * @return {!Promise<!Object>} A Promise resolving to an object describing
    *    the result of the terminate operation, or rejecting with an error
    *    message and code if the operation failed.
    */
   MediaRouteProvider.prototype.terminateRoute = function(routeId) {
     this.handlers_.onBeforeInvokeHandler();
-    // TODO(crbug.com/627967): Remove code path that doesn't expect a Promise
-    // in M56.
-    var maybePromise = this.handlers_.terminateRoute(routeId);
-    var successResult = {
-        result_code: mediaRouterMojom.RouteRequestResultCode.OK
-    };
-    if (maybePromise) {
-      return maybePromise.then(
-        function() { return successResult; },
-        function(err) { return toErrorRouteResponse_(err); }
-      );
-    } else {
-      return Promise.resolve(successResult);
-    }
+    return this.handlers_.terminateRoute(routeId).then(
+        () => ({result_code: mediaRouterMojom.RouteRequestResultCode.OK}),
+        (err) => toErrorRouteResponse_(err));
   };
 
   /**
    * Posts a message to the route designated by |routeId|.
    * @param {!string} routeId
    * @param {!string} message
    * @return {!Promise.<boolean>} Resolved with true if the message was sent,
    *    or false on failure.
    */
   MediaRouteProvider.prototype.sendRouteMessage = function(
@@ skipping 25 matching lines @@
         });
   };
 
   /**
    * Listen for messages from a route.
    * @param {!string} routeId
    */
   MediaRouteProvider.prototype.startListeningForRouteMessages = function(
       routeId) {
     this.handlers_.onBeforeInvokeHandler();
-    if (this.handlers_.startListeningForRouteMessages) {
-      this.handlers_.startListeningForRouteMessages(routeId);
-    } else {
-      // Old API.
-      this.listenForRouteMessagesOld(routeId);
-    }
-  };
-
-
-  /**
-   * A hack to adapt new MR messaging API to old extension messaging API.
-   * TODO(imcheng): Remove in M55 (crbug.com/626395).
-   * @param {!string} routeId
-   */
-  MediaRouteProvider.prototype.listenForRouteMessagesOld = function(routeId) {
-    this.handlers_.onBeforeInvokeHandler();
-    this.handlers_.listenForRouteMessages(routeId)
-        .then(function(messages) {
-          // If messages is empty, then stopListeningForRouteMessages has been
-          // called. We don't need to send it back to MR.
-          if (messages.length > 0) {
-            // Send the messages back to MR, and listen for next batch of
-            // messages.
-            this.mediaRouter_.onRouteMessagesReceived(routeId, messages);
-            this.listenForRouteMessagesOld(routeId);
-          }
-        }.bind(this), function() {
-          // Ignore rejections.
-        }.bind(this));
+    this.handlers_.startListeningForRouteMessages(routeId);
   };
 
   /**
    * @param {!string} routeId
    */
   MediaRouteProvider.prototype.stopListeningForRouteMessages = function(
       routeId) {
     this.handlers_.onBeforeInvokeHandler();
     this.handlers_.stopListeningForRouteMessages(routeId);
   };
@@ skipping 71 matching lines @@
       'sink_id': this.handlers_.searchSinks(sinkId, sourceUrn, searchCriteria)
     });
   };
 
   mediaRouter = new MediaRouter(connector.bindHandleToProxy(
       frameInterfaces.getInterface(mediaRouterMojom.MediaRouter.name),
       mediaRouterMojom.MediaRouter));
 
   return mediaRouter;
 });