Pass origin to StartObservingMediaSinks.

chrome/browser/media/router/presentation_media_sinks_observer.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_media_sinks_observer.h"
 
 #include "chrome/browser/media/router/media_router.h"
 #include "chrome/browser/media/router/media_source.h"
 #include "content/public/browser/presentation_screen_availability_listener.h"
 
 namespace media_router {
 
 PresentationMediaSinksObserver::PresentationMediaSinksObserver(
     MediaRouter* router,
     content::PresentationScreenAvailabilityListener* listener,
     const MediaSource& source)
     : MediaSinksObserver(router, source),
       listener_(listener),
       previous_availablity_(UNKNOWN) {
   DCHECK(router);
   DCHECK(listener_);
   DCHECK(!source.Empty());
 }
 
 PresentationMediaSinksObserver::~PresentationMediaSinksObserver() {
 }
 
 void PresentationMediaSinksObserver::OnSinksReceived(
+    const MediaSource& incomingSource,
     const std::vector<MediaSink>& result) {
+  if (!incomingSource.Equals(source()))

[mark a. foltz, 2016/03/03 22:58:36]

Derek: Should this be a DCHECK()?

[matt.boetger, 2016/03/04 00:22:11]

This method WILL be called with other sources unless we don't want to use the
FOR_EACH_OBSERVER macros.

+    return;
+
   Availability current_availability = result.empty() ? UNAVAILABLE : AVAILABLE;
 
   DVLOG(1) << "PresentationMediaSinksObserver::OnSinksReceived: "
            << source().ToString() << " "
            << (result.empty() ? "unavailable" : "available");
 
   // Don't send if new result is same as previous.
   if (previous_availablity_ != current_availability)
     listener_->OnScreenAvailabilityChanged(current_availability == AVAILABLE);
 
   previous_availablity_ = current_availability;
 }
 
 }  // namespace media_router