CastRemotingConnector: Fix wrong assumption about MR route filtering.

chrome/browser/media/cast_remoting_connector.cc

 // Copyright 2016 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/cast_remoting_connector.h"
 
 #include <stdio.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 216 matching lines @@
 void CastRemotingConnector::CreateRemoterFactory(
     content::RenderFrameHost* render_frame_host,
     media::mojom::RemoterFactoryRequest request) {
   mojo::MakeStrongBinding(
       base::MakeUnique<FrameRemoterFactory>(render_frame_host),
       std::move(request));
 }
 
 CastRemotingConnector::CastRemotingConnector(
     media_router::MediaRouter* router,
-    const media_router::MediaSource::Id& route_source_id)
-    : media_router::MediaRoutesObserver(router, route_source_id),
+    const media_router::MediaSource::Id& media_source_id)
+    : media_router::MediaRoutesObserver(router),
+      media_source_id_(media_source_id),
       session_counter_(0),
       active_bridge_(nullptr),
       weak_factory_(this) {}
 
 CastRemotingConnector::~CastRemotingConnector() {
   // Remoting should not be active at this point, and this instance is expected
   // to outlive all bridges. See comment in CreateBridge().
   DCHECK(!active_bridge_);
   DCHECK(bridges_.empty());
 }
@@ skipping 292 matching lines @@
       notifyee->OnSinkGone();
   }
 
   // There shouldn't be an active RemotingBridge at this point, since there is
   // currently no known remoting route.
   DCHECK(!active_bridge_);
 
   // Scan |routes| for a new remoting route. If one is found, begin processing
   // messages on the route, and notify the sources that remoting is now
   // available.
-  if (!routes.empty()) {
-    const media_router::MediaRoute& route = routes.front();
+  for (const media_router::MediaRoute& route : routes) {
+    if (route.media_source().id() != media_source_id_)
+      continue;
     message_observer_.reset(new MessageObserver(
         media_router::MediaRoutesObserver::router(), route.media_route_id(),
         this));
     // TODO(miu): In the future, scan the route ID for sink capabilities
     // properties and pass these to the source in the OnSinkAvailable()
     // notification.
     for (RemotingBridge* notifyee : bridges_)
       notifyee->OnSinkAvailable();
+    break;
   }
 }