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 133 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;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(MediaSinksQuery);
   };
 
   struct MediaRoutesQuery {
@@ skipping 72 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 DoStopObservingMediaSinks(const MediaSource::Id& source_id);
+  void DoStartObservingMediaSinks(const MediaSource& source);
+  void DoStopObservingMediaSinks(const MediaSource& source);
   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,
       mojo::Array<interfaces::RouteMessagePtr> messages,
       bool error);
 
   // Error handler callback for |binding_| and |media_route_provider_|.
   void OnConnectionError();
 
   // interfaces::MediaRouter implementation.
   void RegisterMediaRouteProvider(
       interfaces::MediaRouteProviderPtr media_route_provider_ptr,
       const interfaces::MediaRouter::RegisterMediaRouteProviderCallback&
           callback) override;
   void OnIssue(interfaces::IssuePtr issue) override;
   void OnSinksReceived(const mojo::String& media_source,
+                       const mojo::String& origin,
                        mojo::Array<interfaces::MediaSinkPtr> sinks) override;
   void OnRoutesUpdated(mojo::Array<interfaces::MediaRoutePtr> routes,
       const mojo::String& media_source,
       mojo::Array<mojo::String> joinable_route_ids) override;
   void OnSinkAvailabilityUpdated(
       interfaces::MediaRouter::SinkAvailability availability) override;
   void OnPresentationConnectionStateChanged(
       const mojo::String& route_id,
       interfaces::MediaRouter::PresentationConnectionState state) override;
   void OnPresentationConnectionClosed(
@@ skipping 31 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>>
+  base::ScopedPtrHashMap<MediaSource, scoped_ptr<MediaSinksQuery>>
       sinks_queries_;
 
   base::ScopedPtrHashMap<MediaSource::Id, scoped_ptr<MediaRoutesQuery>>
       routes_queries_;
 
   using PresentationSessionMessagesObserverList =
       base::ObserverList<PresentationSessionMessagesObserver>;
   base::ScopedPtrHashMap<MediaRoute::Id,
                          scoped_ptr<PresentationSessionMessagesObserverList>>
       messages_observers_;
@@ skipping 40 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_