[Media Router] Add MediaSink subtypes

chrome/browser/media/router/mojo/media_router_mojo_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/mojo/media_router_mojo_impl.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 156 matching lines @@
 }
 
 void MediaRouterMojoImpl::OnIssue(const IssueInfo& issue) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DVLOG_WITH_INSTANCE(1) << "OnIssue " << issue.title;
   issue_manager_.AddIssue(issue);
 }
 
 void MediaRouterMojoImpl::OnSinksReceived(
     const std::string& media_source,
-    const std::vector<MediaSink>& sinks,
+    const std::vector<MediaSinkInternal>& internal_sinks,
     const std::vector<url::Origin>& origins) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DVLOG_WITH_INSTANCE(1) << "OnSinksReceived";
   auto it = sinks_queries_.find(media_source);
   if (it == sinks_queries_.end()) {
     DVLOG_WITH_INSTANCE(1) << "Received sink list without MediaSinksQuery.";
     return;
   }
 
+  std::vector<MediaSink> sinks(internal_sinks.size());

[imcheng, 2017/03/01 22:54:18]

This actually creates a vector with N default-constructed MediaSinks. I think
what you want is:

std::vector<MediaSink> sinks;
sinks.reserve(internal_sinks.size());

[zhaobin, 2017/03/03 23:56:42]

Thanks a lot!

[zhaobin, 2017/03/03 23:56:42]

Done.

+  for (const auto& internal_sink : internal_sinks)
+    sinks.push_back(internal_sink.sink());
+
   auto* sinks_query = it->second.get();
   sinks_query->has_cached_result = true;
   sinks_query->origins = origins;
   sinks_query->cached_sink_list = sinks;
 
   if (!sinks_query->observers.might_have_observers()) {
     DVLOG_WITH_INSTANCE(1)
         << "Received sink list without any active observers: " << media_source;
   } else {
     for (auto& observer : sinks_query->observers) {
@@ skipping 732 matching lines @@
                         base::Unretained(this), source_id));
 }
 
 void MediaRouterMojoImpl::DoUpdateMediaSinks(
     const MediaSource::Id& source_id) {
   DVLOG_WITH_INSTANCE(1) << "DoUpdateMediaSinks" << source_id;
   media_route_provider_->UpdateMediaSinks(source_id);
 }
 
 }  // namespace media_router