[Media Router] Export origin mojom definition to the extension.

chrome/renderer/resources/extensions/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', [
     'chrome/common/media_router/mojo/media_controller.mojom',
     'chrome/common/media_router/mojo/media_router.mojom',
     'chrome/common/media_router/mojo/media_status.mojom',
@@ skipping 137 matching lines @@
         return PresentationConnectionCloseReason.CLOSED;
       case 'went_away':
         return PresentationConnectionCloseReason.WENT_AWAY;
       default:
         console.error('Unknown presentation connection close reason : ' +
             reason);
         return PresentationConnectionCloseReason.CONNECTION_ERROR;
     }
   }
 
-  // TODO(crbug.com/688177): remove this conversion.
-  /**
-   * Converts Mojo origin to string.
-   * @param {!originMojom.Origin} Mojo origin
-   * @return {string}
-   */
-  function mojoOriginToString_(origin) {
-    return origin.unique ? '' :
-        `${origin.scheme}:\/\/${origin.host}` +
-        `${origin.port ? `:${origin.port}` : ''}/`
-  }
-
-  // TODO(crbug.com/688177): remove this conversion.
+  // TODO(crbug.com/688177): remove this conversion when M60 is in stable.
   /**
    * Converts string to Mojo origin.
-   * @param {string} origin
+   * @param {string|!originMojom.Origin} origin
    * @return {!originMojom.Origin}
    */
   function stringToMojoOrigin_(origin) {
-    var url = new URL(origin);
-    var mojoOrigin = {};
+    if (origin instanceof originMojom.Origin) {
+      return origin;
+    }
+    const url = new URL(origin);
+    const mojoOrigin = {};
     mojoOrigin.scheme = url.protocol.replace(':', '');
     mojoOrigin.host = url.hostname;
     var port = url.port ? Number.parseInt(url.port) : 0;
     switch (mojoOrigin.scheme) {
       case 'http':
         mojoOrigin.port = port || 80;
         break;
       case 'https':
         mojoOrigin.port = port || 443;
         break;
@@ skipping 89 matching lines @@
     return {
       Binding: bindings.Binding,
       DialMediaSink: mediaRouterMojom.DialMediaSink,
       CastMediaSink: mediaRouterMojom.CastMediaSink,
       IPAddress: ipAddressMojom.IPAddress,
       InterfacePtrController: bindings.InterfacePtrController,
       InterfaceRequest: bindings.InterfaceRequest,
       MediaController: mediaControllerMojom.MediaController,
       MediaStatus: mediaStatusMojom.MediaStatus,
       MediaStatusObserverPtr: mediaStatusMojom.MediaStatusObserverPtr,
+      Origin: originMojom.Origin,
       Sink: mediaRouterMojom.MediaSink,
       SinkExtraData: mediaRouterMojom.MediaSinkExtraData,
       TimeDelta: timeMojom.TimeDelta,
       Url: urlMojom.Url,
     };
   };
 
   /**
    * Registers the Media Router Provider Manager with the Media Router.
    * @return {!Promise<string>} Instance ID for the Media Router.
@@ skipping 371 matching lines @@
    *     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,
                timeout, incognito) {
     this.handlers_.onBeforeInvokeHandler();
     return this.handlers_.createRoute(
-        sourceUrn, sinkId, presentationId, mojoOriginToString_(origin), tabId,
+        sourceUrn, sinkId, presentationId, origin, tabId,
         Math.floor(timeout.microseconds / 1000), incognito)
         .then(function(route) {
           return toSuccessRouteResponse_(route);
         },
         function(err) {
           return toErrorRouteResponse_(err);
         });
   };
 
   /**
@@ skipping 10 matching lines @@
    *     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, timeout,
                incognito) {
     this.handlers_.onBeforeInvokeHandler();
     return this.handlers_.joinRoute(
-        sourceUrn, presentationId, mojoOriginToString_(origin), tabId,
+        sourceUrn, presentationId, origin, tabId,
         Math.floor(timeout.microseconds / 1000), incognito)
         .then(function(route) {
           return toSuccessRouteResponse_(route);
         },
         function(err) {
           return toErrorRouteResponse_(err);
         });
   };
 
   /**
@@ skipping 11 matching lines @@
    *     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,
                timeout, incognito) {
     this.handlers_.onBeforeInvokeHandler();
     return this.handlers_.connectRouteByRouteId(
-        sourceUrn, routeId, presentationId, mojoOriginToString_(origin), tabId,
+        sourceUrn, routeId, presentationId, origin, tabId,
         Math.floor(timeout.microseconds / 1000), incognito)
         .then(function(route) {
           return toSuccessRouteResponse_(route);
         },
         function(err) {
           return toErrorRouteResponse_(err);
         });
   };
 
   /**
@@ skipping 181 matching lines @@
     return this.handlers_
         .createMediaRouteController(routeId, controllerRequest, observer)
         .then(() => ({success: true}), e => ({success: false}));
   };
 
   mediaRouter = new MediaRouter(new mediaRouterMojom.MediaRouterPtr(
       frameInterfaces.getInterface(mediaRouterMojom.MediaRouter.name)));
 
   return mediaRouter;
 });