Pass origin to StartObservingMediaSinks.

chrome/browser/media/router/media_router_mojo_impl.h

Index: chrome/browser/media/router/media_router_mojo_impl.h
diff --git a/chrome/browser/media/router/media_router_mojo_impl.h b/chrome/browser/media/router/media_router_mojo_impl.h
index bfe616a1a4e3e405755284d432c28f98cbdcab4f..084056b1a3536cec8175c869564b0fab4c4f095d 100644
--- a/chrome/browser/media/router/media_router_mojo_impl.h
+++ b/chrome/browser/media/router/media_router_mojo_impl.h
@@ -151,6 +151,8 @@ class MediaRouterMojoImpl : public MediaRouterBase,
     // 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;
@@ -243,8 +245,8 @@ class MediaRouterMojoImpl : public MediaRouterBase,
                                   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);
 
@@ -267,6 +269,7 @@ class MediaRouterMojoImpl : public MediaRouterBase,
           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,
@@ -318,7 +321,7 @@ class MediaRouterMojoImpl : public MediaRouterBase,
   // 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>>