[Cast, Android, Presentation API] Fix the logic for showing controller vs chooser dialog

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/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/media/android/router/media_router_android.h"
@@ skipping 75 matching lines @@
       TakeCreateConnectionRequest();
   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();
   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 source_id =
       create_connection_request()->presentation_request().GetMediaSource().id();
   ScopedJavaLocalRef<jstring> jsource_urn =
       base::android::ConvertUTF8ToJavaString(env, 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() == source_id) {
+  MediaRouterAndroid* router = static_cast<MediaRouterAndroid*>(
+      MediaRouterFactory::GetApiForBrowserContext(
+          initiator()->GetBrowserContext()));
+  const MediaRoute* matching_route = router->FindRouteBySource(source_id);
+  if (matching_route) {
     ScopedJavaLocalRef<jstring> jmedia_route_id =
         base::android::ConvertUTF8ToJavaString(
-            env, single_existing_route_->media_route_id());
+            env, matching_route->media_route_id());
 
     Java_ChromeMediaRouterDialogController_openRouteControllerDialog(
         env, java_dialog_controller_.obj(), jsource_urn.obj(),
         jmedia_route_id.obj());
     return;
   }
 
   Java_ChromeMediaRouterDialogController_openRouteChooserDialog(
       env, java_dialog_controller_.obj(), jsource_urn.obj());
 }
 
 void MediaRouterDialogControllerAndroid::CloseMediaRouterDialog() {
   JNIEnv* env = base::android::AttachCurrentThread();
 
   Java_ChromeMediaRouterDialogController_closeDialog(
       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) {
-  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]));
-}
-
 }  // namespace media_router