[Presentation API / Media Router] Clean up default pres URL logic.

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"
 #include "chrome/browser/media/router/media_router_factory.h"
 #include "chrome/browser/media/router/media_source.h"
+#include "chrome/browser/media/router/media_source_helper.h"
+#include "chrome/browser/media/router/presentation_request.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "jni/ChromeMediaRouterDialogController_jni.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(
     media_router::MediaRouterDialogControllerAndroid);
 
 using base::android::ConvertJavaStringToUTF8;
 using content::WebContents;
 
 namespace media_router {
 
 // static
 MediaRouterDialogControllerAndroid*
 MediaRouterDialogControllerAndroid::GetOrCreateForWebContents(
     WebContents* web_contents) {
   DCHECK(web_contents);
   // This call does nothing if the controller already exists.
   MediaRouterDialogControllerAndroid::CreateForWebContents(web_contents);
   return MediaRouterDialogControllerAndroid::FromWebContents(web_contents);
 }
 
 void MediaRouterDialogControllerAndroid::OnSinkSelected(
     JNIEnv* env, jobject obj, jstring jsink_id) {
-  scoped_ptr<CreatePresentationSessionRequest>
-      request(TakePresentationRequest());
+  scoped_ptr<CreatePresentationSessionRequest> create_session_request(
+      TakePresentationRequest());
 
-  const std::string& source_id = request->media_source().id();
-  const GURL& origin = request->frame_url().GetOrigin();
+  const PresentationRequest& presentation_request =
+      create_session_request->presentation_request();
+  const MediaSource::Id source_id(

[mark a. foltz, 2015/10/20 20:15:25]

I actually preferred the previous code, where you call
PresentationRequest::media_source() to get the corresponding source.  What
motivates this change?

[imcheng, 2015/10/24 00:41:19]

It's because now the CreateSessionRequest now holds a PresentationRequest which
holds a presentation url. I will add a helper method to return the MediaSource
to reduce the clutter here?

+      MediaSourceForPresentationUrl(presentation_request.presentation_url())
+          .id());
+  const GURL origin(presentation_request.frame_url().GetOrigin());
 
   std::vector<MediaRouteResponseCallback> route_response_callbacks;
   route_response_callbacks.push_back(
       base::Bind(&CreatePresentationSessionRequest::HandleRouteResponse,
-                 base::Passed(&request)));
+                 base::Passed(&create_session_request)));
 
   MediaRouter* router = MediaRouterFactory::GetApiForBrowserContext(
       initiator()->GetBrowserContext());
   router->CreateRoute(source_id, ConvertJavaStringToUTF8(env, jsink_id), origin,
                       SessionTabHelper::IdForTab(initiator()),
                       route_response_callbacks);
 }
 
 void MediaRouterDialogControllerAndroid::OnRouteClosed(
     JNIEnv* env,
@@ skipping 41 matching lines @@
 bool MediaRouterDialogControllerAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 MediaRouterDialogControllerAndroid::~MediaRouterDialogControllerAndroid() {
 }
 
 void MediaRouterDialogControllerAndroid::CreateMediaRouterDialog() {
   JNIEnv* env = base::android::AttachCurrentThread();
 
+  const std::string& presentation_url =
+      create_session_request()->presentation_request().presentation_url();
   const MediaSource::Id& media_source_id =
-      presentation_request()->media_source().id();
+      MediaSourceForPresentationUrl(presentation_url).id();
   ScopedJavaLocalRef<jstring> jsource_urn =
       base::android::ConvertUTF8ToJavaString(env, media_source_id);
 
   // 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) {
@@ skipping 34 matching lines @@
   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]));
 }
 
 }  // namespace media_router