[Media Router] Add MediaSink subtypes

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

Index: chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc
diff --git a/chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc b/chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc
index e36055277921e7499c1e5a35718c4be4bd4c7531..cd8f2ed483ffed7e96e9aa75753ff55569dedc01 100644
--- a/chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc
+++ b/chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc
@@ -720,17 +720,11 @@ TEST_F(MediaRouterMojoImplTest, RegisterAndUnregisterMediaSinksObserver) {
   expected_sinks.push_back(
       MediaSink(kSinkId2, kSinkName, MediaSink::IconType::CAST));
 
-  std::vector<mojom::MediaSinkPtr> mojo_sinks(2);
-  mojo_sinks[0] = mojom::MediaSink::New();
-  mojo_sinks[0]->sink_id = kSinkId;
-  mojo_sinks[0]->name = kSinkName;
-  mojo_sinks[0]->icon_type =
-      media_router::mojom::MediaSink::IconType::CAST;
-  mojo_sinks[1] = mojom::MediaSink::New();
-  mojo_sinks[1]->sink_id = kSinkId2;
-  mojo_sinks[1]->name = kSinkName;
-  mojo_sinks[1]->icon_type =
-      media_router::mojom::MediaSink::IconType::CAST;
+  std::vector<std::unique_ptr<MediaSink>> media_sinks;
+  media_sinks.push_back(base::MakeUnique<MediaSink>(kSinkId, kSinkName,
+                                                    MediaSink::IconType::CAST));
+  media_sinks.push_back(base::MakeUnique<MediaSink>(kSinkId2, kSinkName,
+                                                    MediaSink::IconType::CAST));
 
   base::RunLoop run_loop;
   EXPECT_CALL(*sinks_observer, OnSinksReceived(SequenceEquals(expected_sinks)));
@@ -738,7 +732,7 @@ TEST_F(MediaRouterMojoImplTest, RegisterAndUnregisterMediaSinksObserver) {
               OnSinksReceived(SequenceEquals(expected_sinks)))
       .WillOnce(InvokeWithoutArgs([&run_loop]() { run_loop.Quit(); }));
   media_router_proxy_->OnSinksReceived(
-      media_source.id(), std::move(mojo_sinks),
+      media_source.id(), std::move(media_sinks),
       std::vector<std::string>(1, origin.spec()));
   run_loop.Run();