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

chrome/browser/media/router/presentation_service_delegate_impl.cc

Index: chrome/browser/media/router/presentation_service_delegate_impl.cc
diff --git a/chrome/browser/media/router/presentation_service_delegate_impl.cc b/chrome/browser/media/router/presentation_service_delegate_impl.cc
index ba385dcebbcfb22ffd203b33dc3086aeb4549f2c..d3b9f599e39d0a5d6b911341c0eccb088fb8beee 100644
--- a/chrome/browser/media/router/presentation_service_delegate_impl.cc
+++ b/chrome/browser/media/router/presentation_service_delegate_impl.cc
@@ -57,14 +57,14 @@ RenderFrameHostId GetRenderFrameHostId(RenderFrameHost* render_frame_host) {
 
 // Gets the last committed URL for the render frame specified by
 // |render_frame_host_id|.
-GURL GetLastCommittedURLForFrame(RenderFrameHostId render_frame_host_id) {
+url::Origin GetLastCommittedURLForFrame(
+    RenderFrameHostId render_frame_host_id) {
   RenderFrameHost* render_frame_host = RenderFrameHost::FromID(
       render_frame_host_id.first, render_frame_host_id.second);
   if (!render_frame_host)
-    return GURL();
+    return url::Origin();
 
-  // TODO(crbug.com/632623): Use url::Origin in place of GURL for origins
-  return render_frame_host->GetLastCommittedOrigin().GetURL();
+  return render_frame_host->GetLastCommittedOrigin();
 }
 
 // Observes messages originating from the MediaSink connected to a MediaRoute
@@ -236,7 +236,7 @@ bool PresentationFrame::SetScreenAvailabilityListener(
 
   sinks_observer.reset(new PresentationMediaSinksObserver(
       router_, listener, source,
-      GetLastCommittedURLForFrame(render_frame_host_id_).GetOrigin()));
+      GetLastCommittedURLForFrame(render_frame_host_id_)));
 
   if (!sinks_observer->Init()) {
     url_to_sinks_observer_.erase(source.id());
@@ -560,9 +560,10 @@ void PresentationFrameManager::SetDefaultPresentationUrls(
     ClearDefaultPresentationRequest();
   } else {
     DCHECK(!callback.is_null());
-    GURL frame_url(GetLastCommittedURLForFrame(render_frame_host_id));
+    url::Origin frame_origin =

[mark a. foltz, 2017/01/24 04:04:18]

const auto& frame_origin

[steimel, 2017/01/25 19:01:11]

Done.

+        GetLastCommittedURLForFrame(render_frame_host_id);
     PresentationRequest request(render_frame_host_id, default_presentation_urls,
-                                frame_url);
+                                frame_origin);
     default_presentation_started_callback_ = callback;
     SetDefaultPresentationRequest(request);
   }
@@ -831,8 +832,8 @@ void PresentationServiceDelegateImpl::JoinSession(
     return;
   }
 
-  const url::Origin& origin = url::Origin(GetLastCommittedURLForFrame(
-      RenderFrameHostId(render_process_id, render_frame_id)));
+  const url::Origin& origin = GetLastCommittedURLForFrame(
+      RenderFrameHostId(render_process_id, render_frame_id));
 
 #if !defined(OS_ANDROID)
   if (IsAutoJoinPresentationId(presentation_id) &&
@@ -853,7 +854,7 @@ void PresentationServiceDelegateImpl::JoinSession(
                  weak_factory_.GetWeakPtr(), render_process_id, render_frame_id,
                  presentation_url, presentation_id, success_cb, error_cb));
   router_->JoinRoute(MediaSourceForPresentationUrl(presentation_url).id(),
-                     presentation_id, origin.GetURL(), web_contents_,
+                     presentation_id, origin, web_contents_,
                      route_response_callbacks, base::TimeDelta(), incognito);
 }