[Media Router] Add origins to sink query results.

chrome/browser/ui/webui/media_router/query_result_manager.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/ui/webui/media_router/query_result_manager.h"
 
 #include "base/containers/hash_tables.h"
 #include "base/stl_util.h"
 #include "chrome/browser/media/router/media_router.h"
 #include "chrome/browser/media/router/media_sinks_observer.h"
 
 namespace media_router {
 
 // MediaSinkObserver that propagates results back to |result_manager|.
 // An instance of this class is associated with each registered MediaCastMode.
 class QueryResultManager::CastModeMediaSinksObserver
     : public MediaSinksObserver {
  public:
   CastModeMediaSinksObserver(MediaCastMode cast_mode,
                              const MediaSource& source,
+                             const GURL& origin,
                              MediaRouter* router,
                              QueryResultManager* result_manager)
-      : MediaSinksObserver(router, source),
+      : MediaSinksObserver(router, source, origin),
         cast_mode_(cast_mode),
         result_manager_(result_manager) {
     DCHECK(result_manager);
   }
 
   ~CastModeMediaSinksObserver() override {}
 
   // MediaSinksObserver
   void OnSinksReceived(const std::vector<MediaSink>& result) override {
     latest_sink_ids_.clear();
@@ skipping 32 matching lines @@
   observers_.AddObserver(observer);
 }
 
 void QueryResultManager::RemoveObserver(Observer* observer) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(observer);
   observers_.RemoveObserver(observer);
 }
 
 void QueryResultManager::StartSinksQuery(MediaCastMode cast_mode,
-                                         const MediaSource& source) {
+                                         const MediaSource& source,
+                                         const GURL& origin) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (source.Empty()) {
     LOG(WARNING) << "StartSinksQuery called with empty source for "
                  << cast_mode;
     return;
   }
 
   SetSourceForCastMode(cast_mode, source);
   RemoveObserverForCastMode(cast_mode);
   UpdateWithSinksQueryResult(cast_mode, std::vector<MediaSink>());
 
   scoped_ptr<CastModeMediaSinksObserver> observer(
-      new CastModeMediaSinksObserver(cast_mode, source, router_, this));
+      new CastModeMediaSinksObserver(cast_mode, source, origin, router_, this));
   observer->Init();
   auto result =
       sinks_observers_.insert(std::make_pair(cast_mode, std::move(observer)));
   DCHECK(result.second);
   NotifyOnResultsUpdated();
 }
 
 void QueryResultManager::StopSinksQuery(MediaCastMode cast_mode) {
   DCHECK(thread_checker_.CalledOnValidThread());
   RemoveObserverForCastMode(cast_mode);
@@ skipping 68 matching lines @@
 void QueryResultManager::NotifyOnResultsUpdated() {
   std::vector<MediaSinkWithCastModes> sinks;
   for (const auto& sink_pair : all_sinks_) {
     sinks.push_back(sink_pair.second);
   }
   FOR_EACH_OBSERVER(QueryResultManager::Observer, observers_,
       OnResultsUpdated(sinks));
 }
 
 }  // namespace media_router