Pass origin to StartObservingMediaSinks.

chrome/browser/media/router/presentation_service_delegate_impl.cc

 // 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.
 
 #include "chrome/browser/media/router/presentation_service_delegate_impl.h"
 
 #include <string>
 #include <utility>
 
 #include "base/containers/scoped_ptr_hash_map.h"
@@ skipping 51 matching lines @@
 //  * PresentationFrameManager AddDelegateObserver
 //  * Reset 0+ times.
 //  * PresentationFrameManager.RemoveDelegateObserver.
 class PresentationFrame {
  public:
   PresentationFrame(content::WebContents* web_contents, MediaRouter* router);
   ~PresentationFrame();
 
   // Mirror corresponding APIs in PresentationServiceDelegateImpl.
   bool SetScreenAvailabilityListener(
-      content::PresentationScreenAvailabilityListener* listener);
+      content::PresentationScreenAvailabilityListener* listener,
+      const GURL &origin);
   bool RemoveScreenAvailabilityListener(
       content::PresentationScreenAvailabilityListener* listener);
   bool HasScreenAvailabilityListenerForTest(
       const MediaSource::Id& source_id) const;
   std::string GetDefaultPresentationId() const;
   void ListenForConnectionStateChange(
       const content::PresentationSessionInfo& connection,
       const content::PresentationConnectionStateChangedCallback&
           state_changed_cb);
   void ListenForSessionMessages(
@@ skipping 64 matching lines @@
 }
 
 const std::vector<MediaRoute::Id> PresentationFrame::GetRouteIds() const {
   std::vector<MediaRoute::Id> route_ids;
   for (const auto& e : presentation_id_to_route_id_)
     route_ids.push_back(e.second);
   return route_ids;
 }
 
 bool PresentationFrame::SetScreenAvailabilityListener(
-    content::PresentationScreenAvailabilityListener* listener) {
+    content::PresentationScreenAvailabilityListener* listener,
+    const GURL &origin) {
   if (sinks_observer_ && sinks_observer_->listener() == listener)
     return false;
 
   MediaSource source(GetMediaSourceFromListener(listener));
   sinks_observer_.reset(
-      new PresentationMediaSinksObserver(router_, listener, source));
+      new PresentationMediaSinksObserver(router_, listener, source, origin));
 
   if (!sinks_observer_->Init()) {
     sinks_observer_.reset();
     listener->OnScreenAvailabilityNotSupported();
     return false;
   }
 
   return true;
 }
 
@@ skipping 241 matching lines @@
   auto presentation_frame = presentation_frames_.get(render_frame_host_id);
   return presentation_frame ? presentation_frame->GetRouteIds()
                             : std::vector<MediaRoute::Id>();
 }
 
 bool PresentationFrameManager::SetScreenAvailabilityListener(
     const RenderFrameHostId& render_frame_host_id,
     content::PresentationScreenAvailabilityListener* listener) {
   DCHECK(listener);
   auto presentation_frame = GetOrAddPresentationFrame(render_frame_host_id);
-  return presentation_frame->SetScreenAvailabilityListener(listener);
+  GURL frame_url(GetLastCommittedURLForFrame(render_frame_host_id));
+  return presentation_frame->SetScreenAvailabilityListener(listener, frame_url);
 }
 
 bool PresentationFrameManager::RemoveScreenAvailabilityListener(
     const RenderFrameHostId& render_frame_host_id,
     content::PresentationScreenAvailabilityListener* listener) {
   DCHECK(listener);
   auto presentation_frame = presentation_frames_.get(render_frame_host_id);
   return presentation_frame &&
          presentation_frame->RemoveScreenAvailabilityListener(listener);
 }
@@ skipping 438 matching lines @@
 bool PresentationServiceDelegateImpl::HasScreenAvailabilityListenerForTest(
     int render_process_id,
     int render_frame_id,
     const MediaSource::Id& source_id) const {
   RenderFrameHostId render_frame_host_id(render_process_id, render_frame_id);
   return frame_manager_->HasScreenAvailabilityListenerForTest(
       render_frame_host_id, source_id);
 }
 
 }  // namespace media_router