[Media Router] Adds return value to mojo MediaRouteProvider::TerminateRoute.

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_service_registry',
@@ skipping 135 matching lines @@
     }
   }
 
   /**
    * Parses the given route request Error object and converts it to the
    * corresponding result code.
    * @param {!Error} error
    * @return {!mediaRouterMojom.RouteRequestResultCode}
    */
   function getRouteRequestResultCode_(error) {
-    if (error.message.startsWith('timeout'))
-      return mediaRouterMojom.RouteRequestResultCode.TIMED_OUT;
-    else
-      return mediaRouterMojom.RouteRequestResultCode.UNKNOWN_ERROR;
+    return error.errorCode ? error.errorCode :
+      mediaRouterMojom.RouteRequestResultCode.UNKNOWN_ERROR;
   }
 
   /**
    * Creates and returns a successful route response from given route.
    * @param {!MediaRoute} route
    * @return {!Object}
    */
   function toSuccessRouteResponse_(route) {
     return {
         route: routeToMojo_(route),
         result_code: mediaRouterMojom.RouteRequestResultCode.OK
     };
   }
 
   /**
-   * Creates and returns a error route response from given Error object
+   * Creates and returns a error route response from given Error object.
    * @param {!Error} error
    * @return {!Object}
    */
   function toErrorRouteResponse_(error) {
     return {
-        error_text: 'Error creating route: ' + error.message,
+        error_text: error.message,
         result_code: getRouteRequestResultCode_(error)
     };
   }
 
   /**
    * Creates a new MediaRouter.
    * Converts a route struct to its Mojo form.
    * @param {!MediaRouterService} service
    * @constructor
    */
@@ skipping 230 matching lines @@
      * @type {function(!string, !string, !string, !string, !number)}
      */
     this.createRoute = null;
 
     /**
      * @type {function(!string, !string, !string, !number)}
      */
     this.joinRoute = null;
 
     /**
-     * @type {function(string)}
+     * @type {function(string): Promise}
      */
     this.terminateRoute = null;
 
     /**
      * @type {function(string)}
      */
     this.startObservingMediaSinks = null;
 
     /**
      * @type {function(string)}
@@ skipping 225 matching lines @@
           return toSuccessRouteResponse_(route);
         },
         function(err) {
           return toErrorRouteResponse_(err);
         });
   };
 
   /**
    * 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

[imcheng, 2016/07/15 20:40:45]

nit: fix line wrap

[mark a. foltz, 2016/07/15 20:49:04]

Done.

+   *    and code if the operation failed.
    */
   MediaRouteProvider.prototype.terminateRoute = function(routeId) {
-    this.handlers_.terminateRoute(routeId);
+    // 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: RouteRequestResultCode.OK};
+    if (maybePromise) {
+      return maybePromise.then(
+        function() { return successResult; },
+        function(err) { return toErrorRouteResponse_(err); }
+      );
+    } else {
+      return Promise.resolve(successResult);
+    }
   };
 
   /**
    * 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 119 matching lines @@
   };
 
   mediaRouter = new MediaRouter(connector.bindHandleToProxy(
       serviceProvider.connectToService(
           mediaRouterMojom.MediaRouter.name),
       mediaRouterMojom.MediaRouter));
 
   return mediaRouter;
 });