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

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 86ea2173273d3493db74a10456731a3f580ef5a0..9845d5807382248faadd68d6737b392373739448 100644
--- a/extensions/renderer/resources/media_router_bindings.js
+++ b/extensions/renderer/resources/media_router_bindings.js
@@ -153,10 +153,8 @@ define('media_router_bindings', [
    * @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;
   }
 
   /**
@@ -172,13 +170,13 @@ define('media_router_bindings', [
   }
 
   /**
-   * 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)
     };
   }
@@ -429,7 +427,7 @@ define('media_router_bindings', [
     this.joinRoute = null;
 
     /**
-     * @type {function(string)}
+     * @type {function(string): Promise}
      */
     this.terminateRoute = null;
 
@@ -675,9 +673,23 @@ define('media_router_bindings', [
   /**
    * 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);
+    }
   };
 
   /**