CastRemotingConnector: Fix wrong assumption about MR route filtering.

chrome/browser/media/cast_remoting_connector.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_CAST_REMOTING_CONNECTOR_H_
 #define CHROME_BROWSER_MEDIA_CAST_REMOTING_CONNECTOR_H_
 
 #include <set>
 
 #include "base/memory/weak_ptr.h"
@@ skipping 83 matching lines @@
   // back-and-forth between a CastRemotingConnector and a
   // media::mojom::RemotingSource. An instance of this class is owned by its
   // mojo message pipe.
   class RemotingBridge;
 
   // A RouteMessageObserver for the remoting route that passes messages from the
   // Cast Provider back to this connector. An instance of this class only exists
   // while a remoting route is available, and is owned by CastRemotingConnector.
   class MessageObserver;
 
-  // Main constructor. |route_source_id| is the remoting route source specific
-  // to one tab (WebContents).
+  // Main constructor. |media_source_id| refers to any remoted content managed
+  // by this instance (i.e., any remoted content from one tab/WebContents).
   CastRemotingConnector(media_router::MediaRouter* router,
-                        const media_router::MediaSource::Id& route_source_id);
+                        const media_router::MediaSource::Id& media_source_id);
 
   ~CastRemotingConnector() final;
 
   // Creates a RemotingBridge that implements the requested Remoter service, and
   // binds it to the interface |request|.
   void CreateBridge(media::mojom::RemotingSourcePtr source,
                     media::mojom::RemoterRequest request);
 
   // Called by the RemotingBridge constructor/destructor to register/deregister
   // an instance. This allows this connector to broadcast notifications to all
@@ skipping 37 matching lines @@
   void OnDataSendFailed();
 
   // MediaRoutesObserver implementation: Scans |routes| to check whether the
   // existing remoting route has gone away and/or there is a new remoting route
   // established, and take the necessary actions to notify sources and/or
   // shutdown an active remoting session.
   void OnRoutesUpdated(
       const std::vector<media_router::MediaRoute>& routes,
       const std::vector<media_router::MediaRoute::Id>& ignored) final;
 
+  // The MediaSource ID referring to any remoted content managed by this
+  // CastRemotingConnector.
+  const media_router::MediaSource::Id media_source_id_;
+
   // Set of registered RemotingBridges, maintained by RegisterBridge() and
   // DeregisterBridge(). These pointers are always valid while they are in this
   // set.
   std::set<RemotingBridge*> bridges_;
 
   // Created when the Media Router Cast Provider has created a media remoting
   // route to a sink that supports remoting and is available for use. This
   // observer simply dispatches messages from the Cast Provider and sink back to
   // this connector. Once the route is gone, this is reset to null.
   std::unique_ptr<MessageObserver> message_observer_;
@@ skipping 21 matching lines @@
   base::WeakPtrFactory<CastRemotingConnector> weak_factory_;
 
   // Key used with the base::SupportsUserData interface to search for an
   // instance of CastRemotingConnector owned by a WebContents.
   static const void* const kUserDataKey;
 
   DISALLOW_COPY_AND_ASSIGN(CastRemotingConnector);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_CAST_REMOTING_CONNECTOR_H_