Pass origin to StartObservingMediaSinks.

chrome/browser/media/router/media_router_mojo_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_MOJO_IMPL_H_
 #define CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_MOJO_IMPL_H_
 
 #include <stdint.h>
 
 #include <deque>
@@ skipping 150 matching lines @@
    public:
     MediaSinksQuery();
     ~MediaSinksQuery();
 
     // True if the query has been sent to the MRPM.
     bool is_active = false;
 
     // True if cached result is available.
     bool has_cached_result = false;
 
+    GURL origin;
+
     // Cached list of sinks for the query, if |has_cached_result| is true.
     // Empty otherwise.
     std::vector<MediaSink> cached_sink_list;
     base::ObserverList<MediaSinksObserver> observers;
     DISALLOW_COPY_AND_ASSIGN(MediaSinksQuery);
   };
 
   struct MediaRoutesQuery {
    public:
     MediaRoutesQuery();
@@ skipping 67 matching lines @@
   void DoTerminateRoute(const MediaRoute::Id& route_id);
   void DoDetachRoute(const MediaRoute::Id& route_id);
   void DoSendSessionMessage(const MediaRoute::Id& route_id,
                             const std::string& message,
                             const SendRouteMessageCallback& callback);
   void DoSendSessionBinaryMessage(const MediaRoute::Id& route_id,
                                   scoped_ptr<std::vector<uint8_t>> data,
                                   const SendRouteMessageCallback& callback);
   void DoListenForRouteMessages(const MediaRoute::Id& route_id);
   void DoStopListeningForRouteMessages(const MediaRoute::Id& route_id);
-  void DoStartObservingMediaSinks(const MediaSource::Id& source_id);
+  void DoStartObservingMediaSinks(const MediaSource::Id& source_id,
+                                  const GURL& origin);
   void DoStopObservingMediaSinks(const MediaSource::Id& source_id);
   void DoStartObservingMediaRoutes(const MediaSource::Id& source_id);
   void DoStopObservingMediaRoutes(const MediaSource::Id& source_id);
 
   // Invoked when the next batch of messages arrives.
   // |route_id|: ID of route of the messages.
   // |messages|: A list of messages received.
   // |error|: true if an error occurred.
   void OnRouteMessagesReceived(
       const MediaRoute::Id& route_id,
@@ skipping 51 matching lines @@
   // we record the first such reason.
   void SetWakeReason(MediaRouteProviderWakeReason reason);
 
   // Clears the wake reason after the extension has been awoken.
   void ClearWakeReason();
 
   // Pending requests queued to be executed once component extension
   // becomes ready.
   std::deque<base::Closure> pending_requests_;
 
   base::ScopedPtrHashMap<MediaSource::Id, scoped_ptr<MediaSinksQuery>>

[imcheng, 2016/02/16 20:54:18]

since queries with same source and different origin could return different
results, we should make origin part of the map key as well.

[matt.boetger, 2016/03/03 05:42:22]

Done.

       sinks_queries_;
 
   base::ScopedPtrHashMap<MediaSource::Id, scoped_ptr<MediaRoutesQuery>>
       routes_queries_;
 
   base::ObserverList<LocalMediaRoutesObserver> local_routes_observers_;
 
   using PresentationSessionMessagesObserverList =
       base::ObserverList<PresentationSessionMessagesObserver>;
   base::ScopedPtrHashMap<MediaRoute::Id,
@@ skipping 49 matching lines @@
   MediaRouteProviderWakeReason current_wake_reason_;
 
   base::WeakPtrFactory<MediaRouterMojoImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaRouterMojoImpl);
 };
 
 }  // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_MOJO_IMPL_H_