[Media Router] Add MediaSink subtypes

chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 702 matching lines @@
       new MockMediaSinksObserver(router(), MediaSource(kSource2), origin));
   EXPECT_TRUE(unrelated_sinks_observer->Init());
   ProcessEventLoop();
 
   std::vector<MediaSink> expected_sinks;
   expected_sinks.push_back(
       MediaSink(kSinkId, kSinkName, MediaSink::IconType::CAST));
   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)));
   EXPECT_CALL(*extra_sinks_observer,
               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();
 
   // Since the MediaRouterMojoImpl has already received results for
   // |media_source|, return cached results to observers that are subsequently
   // registered.
   std::unique_ptr<MockMediaSinksObserver> cached_sinks_observer(
       new MockMediaSinksObserver(router(), media_source, origin));
   EXPECT_CALL(*cached_sinks_observer,
               OnSinksReceived(SequenceEquals(expected_sinks)));
@@ skipping 808 matching lines @@
   EXPECT_CALL(mock_media_route_provider_,
               UpdateMediaSinks(MediaSourceForDesktop().id()))
       .WillOnce(InvokeWithoutArgs([&run_loop2]() {
         run_loop2.Quit();
       }));
 
   run_loop2.Run();
 }
 
 }  // namespace media_router