Non-Local Join for Media Router and Presentation API

chrome/browser/ui/webui/media_router/media_router_ui.cc

Index: chrome/browser/ui/webui/media_router/media_router_ui.cc
diff --git a/chrome/browser/ui/webui/media_router/media_router_ui.cc b/chrome/browser/ui/webui/media_router/media_router_ui.cc
index 6fa422e450464805deb1e2045fa53c390e1dff2b..79c0ca74e749b5e3463af632ae74afec1bdccf38 100644
--- a/chrome/browser/ui/webui/media_router/media_router_ui.cc
+++ b/chrome/browser/ui/webui/media_router/media_router_ui.cc
@@ -98,16 +98,19 @@ class MediaRouterUI::UIIssuesObserver : public IssuesObserver {
 };
 
 MediaRouterUI::UIMediaRoutesObserver::UIMediaRoutesObserver(
-    MediaRouter* router, const RoutesUpdatedCallback& callback)
-    : MediaRoutesObserver(router), callback_(callback) {
+    MediaRouter* router, const MediaSource::Id& source_id,
+    const RoutesUpdatedCallback& callback)
+    : MediaRoutesObserver(router, source_id), callback_(callback) {
   DCHECK(!callback_.is_null());
 }
 
 MediaRouterUI::UIMediaRoutesObserver::~UIMediaRoutesObserver() {}
 
 void MediaRouterUI::UIMediaRoutesObserver::OnRoutesUpdated(
-    const std::vector<MediaRoute>& routes) {
+    const std::vector<MediaRoute>& routes,
+    const std::vector<MediaRoute::Id>& joinable_route_ids) {
   std::vector<MediaRoute> routes_for_display;
+  std::vector<MediaRoute::Id> joinable_route_ids_for_display;
   for (const MediaRoute& route : routes) {
     if (route.for_display()) {
 #ifndef NDEBUG
@@ -120,11 +123,17 @@ void MediaRouterUI::UIMediaRoutesObserver::OnRoutesUpdated(
         }
       }
 #endif
+      if (std::find(joinable_route_ids.begin(),

[mark a. foltz, 2015/12/09 00:48:17]

Shorter as ContainsValue from base/stl_util.h

[matt.boetger, 2015/12/15 19:21:20]

Done.

+          joinable_route_ids.end(), route.media_route_id()) !=
+          joinable_route_ids.end()) {
+        joinable_route_ids_for_display.push_back(route.media_route_id());
+      }
+
       routes_for_display.push_back(route);
     }
   }
 
-  callback_.Run(routes_for_display);
+  callback_.Run(routes_for_display, joinable_route_ids_for_display);
 }
 
 MediaRouterUI::MediaRouterUI(content::WebUI* web_ui)
@@ -215,11 +224,6 @@ void MediaRouterUI::InitCommon(content::WebContents* initiator) {
 
   TRACE_EVENT_NESTABLE_ASYNC_INSTANT1("media_router", "UI", initiator,
                                       "MediaRouterUI::InitCommon", this);
-  // Register for MediaRoute updates.
-  routes_observer_.reset(new UIMediaRoutesObserver(
-      router_,
-      base::Bind(&MediaRouterUI::OnRoutesUpdated, base::Unretained(this))));
-
   query_result_manager_.reset(new QueryResultManager(router_));
   query_result_manager_->AddObserver(this);
 
@@ -236,15 +240,21 @@ void MediaRouterUI::InitCommon(content::WebContents* initiator) {
 
 void MediaRouterUI::OnDefaultPresentationChanged(
     const PresentationRequest& presentation_request) {
+  MediaSource source = presentation_request.GetMediaSource();
   presentation_request_.reset(new PresentationRequest(presentation_request));
-  query_result_manager_->StartSinksQuery(
-      MediaCastMode::DEFAULT, presentation_request_->GetMediaSource());
+  query_result_manager_->StartSinksQuery(MediaCastMode::DEFAULT, source);
+  // Register for MediaRoute updates.
+  routes_observer_.reset(new UIMediaRoutesObserver(

[mark a. foltz, 2015/12/09 00:48:17]

I assume the UIMediaRoutesObserver dtor handles de-registration of itself.

[matt.boetger, 2015/12/15 19:21:20]

Yes, all route observers handle de-registration of itself via the
MediaRoutesObserver destructor.

+      router_, source.id(),
+      base::Bind(&MediaRouterUI::OnRoutesUpdated, base::Unretained(this))));
+
   UpdateCastModes();
 }
 
 void MediaRouterUI::OnDefaultPresentationRemoved() {
   presentation_request_.reset();
   query_result_manager_->StopSinksQuery(MediaCastMode::DEFAULT);
+  routes_observer_.reset();
   UpdateCastModes();
 }
 
@@ -349,6 +359,43 @@ bool MediaRouterUI::CreateRoute(const MediaSink::Id& sink_id,
   return true;
 }
 
+bool MediaRouterUI::JoinRoute(const MediaSink::Id& sink_id,

[mark a. foltz, 2015/12/09 00:48:17]

I would like to name this ConnectRemoteRoute to make this clear this is a
different code path from reconnecting to a presentation via the presentation
API; i.e., PresentationRequest.connect(id).  That has nothing to do with the UI

[matt.boetger, 2015/12/15 19:21:20]

Done.

+                              const MediaRoute::Id& route_id) {
+  DCHECK(query_result_manager_.get());
+  DCHECK(initiator_);
+
+  current_route_request_id_ = ++route_request_counter_;
+  GURL origin = presentation_request_->frame_url().GetOrigin();
+  DCHECK(origin.is_valid());
+
+  MediaSource source =

[mark a. foltz, 2015/12/09 00:48:17]

Don't you need to check presentation_request_ as well?

It seems like you should refactor to share code between CreateRoute() and
ConnectRemoteRoute(), it looks like the main difference is what request is made
to router_.

[matt.boetger, 2015/12/15 19:21:20]

Done.

+      query_result_manager_->GetSourceForCastMode(MediaCastMode::DEFAULT);
+
+  if (source.Empty()) {
+    LOG(ERROR) << "No MediaSource to join";
+    return false;
+  }
+
+  std::vector<MediaRouteResponseCallback> route_response_callbacks;
+  route_response_callbacks.push_back(base::Bind(
+      &MediaRouterUI::OnRouteResponseReceived, weak_factory_.GetWeakPtr(),
+      current_route_request_id_, sink_id));
+
+  if (presentation_service_delegate_) {
+    route_response_callbacks.push_back(
+        base::Bind(&PresentationServiceDelegateImpl::OnRouteResponse,
+                   presentation_service_delegate_, *presentation_request_));
+  }
+
+  // Start the timer.
+  route_creation_timer_.Start(
+      FROM_HERE, base::TimeDelta::FromSeconds(kCreateRouteTimeoutSeconds), this,
+      &MediaRouterUI::RouteCreationTimeout);
+  router_->JoinRouteByRouteId(source.id(), route_id, origin,
+                     initiator_, route_response_callbacks);
+  return true;
+}
+
 void MediaRouterUI::CloseRoute(const MediaRoute::Id& route_id) {
   router_->CloseRoute(route_id);
 }
@@ -369,9 +416,12 @@ void MediaRouterUI::SetIssue(const Issue* issue) {
   if (ui_initialized_) handler_->UpdateIssue(issue);
 }
 
-void MediaRouterUI::OnRoutesUpdated(const std::vector<MediaRoute>& routes) {
+void MediaRouterUI::OnRoutesUpdated(
+    const std::vector<MediaRoute>& routes,
+    const std::vector<MediaRoute::Id>& joinable_route_ids) {
   routes_ = routes;
-  if (ui_initialized_) handler_->UpdateRoutes(routes_);
+  joinable_route_ids_ = joinable_route_ids;
+  if (ui_initialized_) handler_->UpdateRoutes(routes_, joinable_route_ids_);
 }
 
 void MediaRouterUI::OnRouteResponseReceived(const int route_request_id,