Non-Local Join for Media Router and Presentation API

chrome/browser/media/android/router/media_router_dialog_controller_android.cc

 // 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.
 
 #include "chrome/browser/media/android/router/media_router_dialog_controller_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/media/android/router/media_router_android.h"
 #include "chrome/browser/media/router/media_router.h"
@@ skipping 28 matching lines @@
       request(TakePresentationRequest());
 
   const std::string& source_id = request->media_source().id();
   const GURL& origin = request->frame_url().GetOrigin();
 
   std::vector<MediaRouteResponseCallback> route_response_callbacks;
   route_response_callbacks.push_back(
       base::Bind(&CreatePresentationSessionRequest::HandleRouteResponse,
                  base::Passed(&request)));
 
-  MediaRouter* router = MediaRouterFactory::GetApiForBrowserContext(
-      initiator()->GetBrowserContext());
-  router->CreateRoute(
+  router_->CreateRoute(
       source_id,
       ConvertJavaStringToUTF8(env, jsink_id),
       origin,
       initiator(),
       route_response_callbacks);
 }
 
 void MediaRouterDialogControllerAndroid::OnRouteClosed(
     JNIEnv* env,
     jobject obj,
     jstring jmedia_route_id) {
   std::string media_route_id = ConvertJavaStringToUTF8(env, jmedia_route_id);
 
-  MediaRouter* router = MediaRouterFactory::GetApiForBrowserContext(
-      initiator()->GetBrowserContext());
-
-  router->CloseRoute(media_route_id);
+  router_->CloseRoute(media_route_id);
 
   CancelPresentationRequest();
 }
 
 void MediaRouterDialogControllerAndroid::OnDialogCancelled(
     JNIEnv* env, jobject obj) {
   CancelPresentationRequest();
 }
 
 void MediaRouterDialogControllerAndroid::CancelPresentationRequest() {
   scoped_ptr<CreatePresentationSessionRequest> request(
       TakePresentationRequest());
 
   DCHECK(request);
 
   request->InvokeErrorCallback(content::PresentationError(
       content::PRESENTATION_ERROR_SESSION_REQUEST_CANCELLED,
       "Dialog closed."));
 }
 
 MediaRouterDialogControllerAndroid::MediaRouterDialogControllerAndroid(
     WebContents* web_contents)
-    : MediaRouterDialogController(web_contents),
-      MediaRoutesObserver(MediaRouterFactory::GetApiForBrowserContext(
-          initiator()->GetBrowserContext())) {
+    : MediaRouterDialogController(web_contents) {
   JNIEnv* env = base::android::AttachCurrentThread();
+  router_ = static_cast<MediaRouter*>(

[imcheng, 2015/11/26 00:49:45]

Can the static_cast be removed?

[matt.boetger, 2015/12/01 01:26:55]

Reverting.

+      MediaRouterFactory::GetApiForBrowserContext(
+        initiator()->GetBrowserContext()));
   java_dialog_controller_.Reset(Java_ChromeMediaRouterDialogController_create(
       env,
       reinterpret_cast<jlong>(this),
       base::android::GetApplicationContext()));
 }
 
 // static
 bool MediaRouterDialogControllerAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 MediaRouterDialogControllerAndroid::~MediaRouterDialogControllerAndroid() {
 }
 
 void MediaRouterDialogControllerAndroid::CreateMediaRouterDialog() {
   JNIEnv* env = base::android::AttachCurrentThread();
 
   const MediaSource::Id& media_source_id =
       presentation_request()->media_source().id();
   ScopedJavaLocalRef<jstring> jsource_urn =
       base::android::ConvertUTF8ToJavaString(env, media_source_id);
 
+  routes_observer_.reset(new UIMediaRoutesObserver(
+      router_,
+      media_source_id,

[imcheng, 2015/11/26 00:49:45]

You might want to check with Anton/Mounir if this is correct behavior. It looks
like the previous version has some MediaRoutes logic happening even before this
function is called. Either way, doesn't look like you need to pass in
|media_source_id| since android doesn't need to know joinable routes.

[matt.boetger, 2015/12/01 01:26:55]

Reverting.

+      base::Bind(&MediaRouterDialogControllerAndroid::OnRoutesUpdated,
+        base::Unretained(this))));
+
   // If it's a single route with the same source, show the controller dialog
   // instead of the device picker.
   // TODO(avayvod): maybe this logic should be in
   // PresentationServiceDelegateImpl: if the route exists for the same frame
   // and tab, show the route controller dialog, if not, show the device picker.
   if (single_existing_route_.get() &&
       single_existing_route_->media_source().id() == media_source_id) {
     ScopedJavaLocalRef<jstring> jmedia_route_id =
         base::android::ConvertUTF8ToJavaString(
             env, single_existing_route_->media_route_id());
@@ skipping 15 matching lines @@
       env, java_dialog_controller_.obj());
 }
 
 bool MediaRouterDialogControllerAndroid::IsShowingMediaRouterDialog() const {
   JNIEnv* env = base::android::AttachCurrentThread();
   return Java_ChromeMediaRouterDialogController_isShowingDialog(
       env, java_dialog_controller_.obj());
 }
 
 void MediaRouterDialogControllerAndroid::OnRoutesUpdated(
-    const std::vector<MediaRoute>& routes) {
+    const std::vector<MediaRoute>& routes,
+    const std::vector<MediaRoute::Id>& joinable_route_ids) {
+
   if (routes.size() != 1) {
     single_existing_route_.reset();
     return;
   }
 
   if (single_existing_route_.get() &&
       single_existing_route_->media_route_id() == routes[0].media_route_id()) {
     return;
   }
 
   single_existing_route_.reset(new MediaRoute(routes[0]));
 }
 
+
+MediaRouterDialogControllerAndroid::

[imcheng, 2015/11/26 00:49:45]

This looks copied from MediaRouterUI. I am not sure if android needs that logic
because I am guessing they send back only routes that can be displayed here in
the first place. But it would be good to check with Anton/Mounir.

Otherwise, it would be good to refactor this into chrome/browser/media/router.

[matt.boetger, 2015/12/01 01:26:55]

Reverting.

+  UIMediaRoutesObserver::UIMediaRoutesObserver(
+    MediaRouter* router, const MediaSource::Id source_id,
+    const RoutesUpdatedCallback& callback)
+    : MediaRoutesObserver(router, source_id), callback_(callback) {
+  DCHECK(!callback_.is_null());
+}
+
+MediaRouterDialogControllerAndroid::
+  UIMediaRoutesObserver::~UIMediaRoutesObserver() {}
+
+void MediaRouterDialogControllerAndroid::UIMediaRoutesObserver::OnRoutesUpdated(
+    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
+      for (const MediaRoute& existing_route : routes_for_display) {
+        if (existing_route.media_sink_id() == route.media_sink_id()) {
+          DVLOG(2) << "Received another route for display with the same sink"
+                   << " id as an existing route. "
+                   << route.media_route_id() << " has the same sink id as "
+                   << existing_route.media_sink_id() << ".";
+        }
+      }
+#endif
+      if (std::find(joinable_route_ids.begin(),

[imcheng, 2015/11/26 00:49:45]

Presumably the MRP would only consider a route as joinable only if for_display
is true?

[matt.boetger, 2015/12/01 01:26:55]

Reverting.

+          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, joinable_route_ids_for_display);
+}
+
 }  // namespace media_router