[Media Router] Use TimeDelta in mojo interfaces

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',
     'chrome/browser/media/router/mojo/media_router.mojom',
     'extensions/common/mojo/keep_alive.mojom',
+    'mojo/common/common_custom_types.mojom',
     'mojo/public/js/connection',
     'mojo/public/js/router',
 ], function(bindings,
             core,
             frameInterfaces,
             mediaRouterMojom,
             keepAliveMojom,
+            commonCustomTypesMojom,
             connector,
             routerModule) {
   'use strict';
 
   /**
    * Converts a media sink to a MediaSink Mojo object.
    * @param {!MediaSink} sink A media sink.
    * @return {!mediaRouterMojom.MediaSink} A Mojo MediaSink object.
    */
   function sinkToMojo_(sink) {
@@ skipping 562 matching lines @@
   /**
    * Requests that |sinkId| render the media referenced by |sourceUrn|. If the
    * request is from the Presentation API, then origin and tabId will
    * be populated.
    * @param {!string} sourceUrn Media source to render.
    * @param {!string} sinkId Media sink ID.
    * @param {!string} presentationId Presentation ID from the site
    *     requesting presentation. TODO(mfoltz): Remove.
    * @param {!string} origin Origin of site requesting presentation.
    * @param {!number} tabId ID of tab requesting presentation.
-   * @param {!number} timeoutMillis If positive, the timeout duration for the
-   *     request, measured in seconds. Otherwise, the default duration will be
-   *     used.
+   * @param {!TimeDelta} timeout If positive, the timeout duration for the
+   *     request, measured in microseconds. Otherwise, the default duration will

[miu, 2016/09/10 00:40:17]

nit: Please remove "measured in microseconds" since the timebase of a TimeDelta
is an internal implementation detail. Also, please do this in the comments for
other methods below...

[btolsch, 2016/09/10 00:51:39]

Done.

+   *     be used.
    * @param {!boolean} incognito If true, the route is being requested by
    *     an incognito profile.
    * @return {!Promise.<!Object>} A Promise resolving to an object describing
    *     the newly created media route, or rejecting with an error message on
    *     failure.
    */
   MediaRouteProvider.prototype.createRoute =
       function(sourceUrn, sinkId, presentationId, origin, tabId,
-          timeoutMillis, incognito) {
+          timeout, incognito) {
     return this.handlers_.createRoute(
-        sourceUrn, sinkId, presentationId, origin, tabId, timeoutMillis,
-        incognito)
+        sourceUrn, sinkId, presentationId, origin, tabId,
+        Math.floor(timeout.microseconds / 1000), incognito)
         .then(function(route) {
           return toSuccessRouteResponse_(route);
         },
         function(err) {
           return toErrorRouteResponse_(err);
         });
   };
 
   /**
    * Handles a request via the Presentation API to join an existing route given
    * by |sourceUrn| and |presentationId|. |origin| and |tabId| are used for
    * validating same-origin/tab scope.
    * @param {!string} sourceUrn Media source to render.
    * @param {!string} presentationId Presentation ID to join.
    * @param {!string} origin Origin of site requesting join.
    * @param {!number} tabId ID of tab requesting join.
-   * @param {!number} timeoutMillis If positive, the timeout duration for the
-   *     request, measured in seconds. Otherwise, the default duration will be
-   *     used.
+   * @param {!TimeDelta} timeout If positive, the timeout duration for the
+   *     request, measured in microseconds. Otherwise, the default duration will
+   *     be used.
    * @param {!boolean} incognito If true, the route is being requested by
    *     an incognito profile.
    * @return {!Promise.<!Object>} A Promise resolving to an object describing
    *     the newly created media route, or rejecting with an error message on
    *     failure.
    */
   MediaRouteProvider.prototype.joinRoute =
       function(sourceUrn, presentationId, origin, tabId, timeoutMillis,
                incognito) {
     return this.handlers_.joinRoute(
-        sourceUrn, presentationId, origin, tabId, timeoutMillis, incognito)
+        sourceUrn, presentationId, origin, tabId,
+        Math.floor(timeout.microseconds / 1000), incognito)
         .then(function(route) {
           return toSuccessRouteResponse_(route);
         },
         function(err) {
           return toErrorRouteResponse_(err);
         });
   };
 
   /**
    * Handles a request via the Presentation API to join an existing route given
    * by |sourceUrn| and |routeId|. |origin| and |tabId| are used for
    * validating same-origin/tab scope.
    * @param {!string} sourceUrn Media source to render.
    * @param {!string} routeId Route ID to join.
    * @param {!string} presentationId Presentation ID to join.
    * @param {!string} origin Origin of site requesting join.
    * @param {!number} tabId ID of tab requesting join.
-   * @param {!number} timeoutMillis If positive, the timeout duration for the
-   *     request, measured in seconds. Otherwise, the default duration will be
-   *     used.
+   * @param {!TimeDelta} timeout If positive, the timeout duration for the
+   *     request, measured in microseconds. Otherwise, the default duration will
+   *     be used.
    * @param {!boolean} incognito If true, the route is being requested by
    *     an incognito profile.
    * @return {!Promise.<!Object>} A Promise resolving to an object describing
    *     the newly created media route, or rejecting with an error message on
    *     failure.
    */
   MediaRouteProvider.prototype.connectRouteByRouteId =
       function(sourceUrn, routeId, presentationId, origin, tabId,
-               timeoutMillis, incognito) {
+               timeout, incognito) {
     return this.handlers_.connectRouteByRouteId(
-        sourceUrn, routeId, presentationId, origin, tabId, timeoutMillis,
-        incognito)
+        sourceUrn, routeId, presentationId, origin, tabId,
+        Math.floor(timeout.microseconds / 1000), incognito)
         .then(function(route) {
           return toSuccessRouteResponse_(route);
         },
         function(err) {
           return toErrorRouteResponse_(err);
         });
   };
 
   /**
    * Terminates the route specified by |routeId|.
@@ skipping 166 matching lines @@
     });
   };
 
   mediaRouter = new MediaRouter(connector.bindHandleToProxy(
       frameInterfaces.getInterface(mediaRouterMojom.MediaRouter.name),
       mediaRouterMojom.MediaRouter));
 
   return mediaRouter;
 });