Revert of Convert MediaRouter mojom apis to intake url::Origin objects instead of strings

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', [
     'content/public/renderer/frame_interfaces',
     'chrome/browser/media/router/mojo/media_router.mojom',
     'extensions/common/mojo/keep_alive.mojom',
     'mojo/common/time.mojom',
     'mojo/public/js/bindings',
-    'url/mojo/origin.mojom',
 ], function(frameInterfaces,
             mediaRouterMojom,
             keepAliveMojom,
             timeMojom,
-            bindings,
-            originMojom) {
+            bindings) {
   '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) {
     return new mediaRouterMojom.MediaSink({
       'name': sink.friendlyName,
@@ skipping 108 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.
-  /**
-   * Converts string to Mojo origin.
-   * @param {string} origin
-   * @return {!originMojom.Origin}
-   */
-  function stringToMojoOrigin_(origin) {
-    var url = new URL(origin);
-    var 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;
-      default:
-        throw new Error('Scheme must be http or https');
-    }
-    return new originMojom.Origin(mojoOrigin);
-  }
-
   /**
    * Parses the given route request Error object and converts it to the
    * corresponding result code.
    * @param {!Error} error
    * @return {!mediaRouterMojom.RouteRequestResultCode}
    */
   function getRouteRequestResultCode_(error) {
     return error.errorCode ? error.errorCode :
       mediaRouterMojom.RouteRequestResultCode.UNKNOWN_ERROR;
   }
@@ skipping 91 matching lines @@
   /**
    * 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>} origins
    */
   MediaRouter.prototype.onSinksReceived = function(sourceUrn, sinks,
       origins) {
     this.service_.onSinksReceived(sourceUrn, sinks.map(sinkToMojo_),
-        origins.map(stringToMojoOrigin_));
+        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 297 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 {!originMojom.Origin} origin Origin of site requesting presentation.
+   * @param {!string} origin Origin of site requesting presentation.
    * @param {!number} tabId ID of tab requesting presentation.
    * @param {!TimeDelta} timeout If positive, the timeout duration for the
    *     request. 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.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);
         });
   };
 
   /**
    * 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 {!originMojom.Origin} origin Origin of site requesting join.
+   * @param {!string} origin Origin of site requesting join.
    * @param {!number} tabId ID of tab requesting join.
    * @param {!TimeDelta} timeout If positive, the timeout duration for the
    *     request. 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, 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);
         });
   };
 
   /**
    * 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 {!originMojom.Origin} origin Origin of site requesting join.
+   * @param {!string} origin Origin of site requesting join.
    * @param {!number} tabId ID of tab requesting join.
    * @param {!TimeDelta} timeout If positive, the timeout duration for the
    *     request. 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,
                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 137 matching lines @@
     return Promise.resolve({
       'sink_id': this.handlers_.searchSinks(sinkId, sourceUrn, searchCriteria)
     });
   };
 
   mediaRouter = new MediaRouter(new mediaRouterMojom.MediaRouterPtr(
       frameInterfaces.getInterface(mediaRouterMojom.MediaRouter.name)));
 
   return mediaRouter;
 });