[Media Router] Add MediaSink subtypes

chrome/browser/media/router/mojo/media_router_mojo_impl.cc

Index: chrome/browser/media/router/mojo/media_router_mojo_impl.cc
diff --git a/chrome/browser/media/router/mojo/media_router_mojo_impl.cc b/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
index 91c840db4e345016fb91f90ed364b62f39c13094..b089070ff5c8d4db8f151b6b16163bdd2b00f5c5 100644
--- a/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
+++ b/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
@@ -175,7 +175,7 @@ void MediaRouterMojoImpl::OnIssue(const IssueInfo& issue) {
 
 void MediaRouterMojoImpl::OnSinksReceived(
     const std::string& media_source,
-    std::vector<mojom::MediaSinkPtr> sinks,
+    const std::vector<MediaSink>& sinks,
     const std::vector<std::string>& origins) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DVLOG_WITH_INSTANCE(1) << "OnSinksReceived";
@@ -197,15 +197,10 @@ void MediaRouterMojoImpl::OnSinksReceived(
     origin_list.push_back(origin);
   }
 
-  std::vector<MediaSink> sink_list;
-  sink_list.reserve(sinks.size());
-  for (size_t i = 0; i < sinks.size(); ++i)
-    sink_list.push_back(sinks[i].To<MediaSink>());
-
   auto* sinks_query = it->second.get();
   sinks_query->has_cached_result = true;
   sinks_query->origins.swap(origin_list);
-  sinks_query->cached_sink_list.swap(sink_list);
+  sinks_query->cached_sink_list = sinks;
 
   if (!sinks_query->observers.might_have_observers()) {
     DVLOG_WITH_INSTANCE(1)