[Media Router] Create MediaSinkServiceBase and make DialMediaSinkService inherit from it

chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl_unittest.cc

Index: chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl_unittest.cc
diff --git a/chrome/browser/media/router/discovery/dial/dial_media_sink_service_unittest.cc b/chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl_unittest.cc
similarity index 58%
rename from chrome/browser/media/router/discovery/dial/dial_media_sink_service_unittest.cc
rename to chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl_unittest.cc
index acebc86a48ffcd273b574900a29f74c3ef9b3bbb..6f3b591d2a320e691974072c2a4d03809552b79a 100644
--- a/chrome/browser/media/router/discovery/dial/dial_media_sink_service_unittest.cc
+++ b/chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl_unittest.cc
@@ -2,7 +2,7 @@
 // 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/discovery/dial/dial_media_sink_service.h"
+#include "chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.h"
 #include "base/test/mock_callback.h"
 #include "base/timer/mock_timer.h"
 #include "chrome/browser/media/router/discovery/dial/dial_device_data.h"
@@ -16,38 +16,6 @@
 using ::testing::_;
 using ::testing::Return;
 
-namespace {
-
-media_router::DialSinkExtraData CreateDialSinkExtraData(
-    const std::string& model_name,
-    const std::string& ip_address,
-    const std::string& app_url) {
-  media_router::DialSinkExtraData dial_extra_data;
-  EXPECT_TRUE(dial_extra_data.ip_address.AssignFromIPLiteral(ip_address));
-  dial_extra_data.model_name = model_name;
-  dial_extra_data.app_url = GURL(app_url);
-  return dial_extra_data;
-}
-
-std::vector<media_router::MediaSinkInternal> CreateDialMediaSinks() {
-  media_router::MediaSink sink1("sink1", "sink_name_1",
-                                media_router::MediaSink::IconType::CAST);
-  media_router::DialSinkExtraData extra_data1 = CreateDialSinkExtraData(
-      "model_name1", "192.168.1.1", "https://example1.com");
-
-  media_router::MediaSink sink2("sink2", "sink_name_2",
-                                media_router::MediaSink::IconType::CAST);
-  media_router::DialSinkExtraData extra_data2 = CreateDialSinkExtraData(
-      "model_name2", "192.168.1.2", "https://example2.com");
-
-  std::vector<media_router::MediaSinkInternal> sinks;
-  sinks.push_back(media_router::MediaSinkInternal(sink1, extra_data1));
-  sinks.push_back(media_router::MediaSinkInternal(sink2, extra_data2));
-  return sinks;
-}
-
-}  // namespace
-
 namespace media_router {
 
 class TestDialRegistry : public DialRegistry {
@@ -74,13 +42,13 @@ class MockDeviceDescriptionService : public DeviceDescriptionService {
                     net::URLRequestContextGetter* request_context));
 };
 
-class DialMediaSinkServiceTest : public ::testing::Test {
+class DialMediaSinkServiceImplTest : public ::testing::Test {
  public:
-  DialMediaSinkServiceTest()
+  DialMediaSinkServiceImplTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
         media_sink_service_(
-            new DialMediaSinkService(mock_sink_discovered_cb_.Get(),
-                                     profile_.GetRequestContext())) {}
+            new DialMediaSinkServiceImpl(mock_sink_discovered_cb_.Get(),
+                                         profile_.GetRequestContext())) {}
 
   void SetUp() override {
     EXPECT_CALL(test_dial_registry_,
@@ -106,16 +74,6 @@ class DialMediaSinkServiceTest : public ::testing::Test {
     EXPECT_CALL(test_dial_registry_, OnListenerRemoved());
   }
 
-  void TestFetchCompleted(const std::vector<MediaSinkInternal>& old_sinks,
-                          const std::vector<MediaSinkInternal>& new_sinks) {
-    media_sink_service_->mrp_sinks_ =
-        std::set<MediaSinkInternal>(old_sinks.begin(), old_sinks.end());
-    media_sink_service_->current_sinks_ =
-        std::set<MediaSinkInternal>(new_sinks.begin(), new_sinks.end());
-    EXPECT_CALL(mock_sink_discovered_cb_, Run(new_sinks));
-    media_sink_service_->OnFetchCompleted();
-  }
-
  protected:
   const content::TestBrowserThreadBundle thread_bundle_;
   TestingProfile profile_;
@@ -133,12 +91,12 @@ class DialMediaSinkServiceTest : public ::testing::Test {
   MockDeviceDescriptionService* mock_description_service_;
   base::MockTimer* mock_timer_;
 
-  std::unique_ptr<DialMediaSinkService> media_sink_service_;
+  std::unique_ptr<DialMediaSinkServiceImpl> media_sink_service_;
 
-  DISALLOW_COPY_AND_ASSIGN(DialMediaSinkServiceTest);
+  DISALLOW_COPY_AND_ASSIGN(DialMediaSinkServiceImplTest);
 };
 
-TEST_F(DialMediaSinkServiceTest, TestStart) {
+TEST_F(DialMediaSinkServiceImplTest, TestStart) {
   media_sink_service_->Start();
 
   DialRegistry::DeviceList deviceList;
@@ -158,7 +116,7 @@ TEST_F(DialMediaSinkServiceTest, TestStart) {
   EXPECT_TRUE(media_sink_service_->finish_timer_->IsRunning());
 }
 
-TEST_F(DialMediaSinkServiceTest, TestOnDeviceDescriptionAvailable) {
+TEST_F(DialMediaSinkServiceImplTest, TestOnDeviceDescriptionAvailable) {
   DialDeviceData device_data("first", GURL("http://127.0.0.1/dd.xml"),
                              base::Time::Now());
   ParsedDialDeviceDescription device_description;
@@ -181,7 +139,7 @@ TEST_F(DialMediaSinkServiceTest, TestOnDeviceDescriptionAvailable) {
   EXPECT_EQ(size_t(1), media_sink_service_->current_sinks_.size());
 }
 
-TEST_F(DialMediaSinkServiceTest, TestTimer) {
+TEST_F(DialMediaSinkServiceImplTest, TestTimer) {
   DialDeviceData device_data("first", GURL("http://127.0.0.1/dd.xml"),
                              base::Time::Now());
   ParsedDialDeviceDescription device_description;
@@ -209,56 +167,4 @@ TEST_F(DialMediaSinkServiceTest, TestTimer) {
   EXPECT_TRUE(mock_timer_->IsRunning());
 }
 
-TEST_F(DialMediaSinkServiceTest, TestFetchCompleted_SameSink) {
-  std::vector<MediaSinkInternal> old_sinks;
-  std::vector<MediaSinkInternal> new_sinks = CreateDialMediaSinks();
-  TestFetchCompleted(old_sinks, new_sinks);
-
-  // Same sink
-  EXPECT_CALL(mock_sink_discovered_cb_, Run(new_sinks)).Times(0);
-  media_sink_service_->OnFetchCompleted();
-}
-
-TEST_F(DialMediaSinkServiceTest, TestFetchCompleted_OneNewSink) {
-  std::vector<MediaSinkInternal> old_sinks = CreateDialMediaSinks();
-  std::vector<MediaSinkInternal> new_sinks = CreateDialMediaSinks();
-  MediaSink sink3("sink3", "sink_name_3", MediaSink::IconType::CAST);
-  DialSinkExtraData extra_data3 = CreateDialSinkExtraData(
-      "model_name3", "192.168.1.3", "https://example3.com");
-  new_sinks.push_back(MediaSinkInternal(sink3, extra_data3));
-  TestFetchCompleted(old_sinks, new_sinks);
-}
-
-TEST_F(DialMediaSinkServiceTest, TestFetchCompleted_RemovedOneSink) {
-  std::vector<MediaSinkInternal> old_sinks = CreateDialMediaSinks();
-  std::vector<MediaSinkInternal> new_sinks = CreateDialMediaSinks();
-  new_sinks.erase(new_sinks.begin());
-  TestFetchCompleted(old_sinks, new_sinks);
-}
-
-TEST_F(DialMediaSinkServiceTest, TestFetchCompleted_UpdatedOneSink) {
-  std::vector<MediaSinkInternal> old_sinks = CreateDialMediaSinks();
-  std::vector<MediaSinkInternal> new_sinks = CreateDialMediaSinks();
-  new_sinks[0].set_name("sink_name_4");
-  TestFetchCompleted(old_sinks, new_sinks);
-}
-
-TEST_F(DialMediaSinkServiceTest, TestFetchCompleted_Mixed) {
-  std::vector<MediaSinkInternal> old_sinks = CreateDialMediaSinks();
-
-  MediaSink sink1("sink1", "sink_name_1", MediaSink::IconType::CAST);
-  DialSinkExtraData extra_data2 = CreateDialSinkExtraData(
-      "model_name2", "192.168.1.2", "https://example2.com");
-
-  MediaSink sink3("sink3", "sink_name_3", MediaSink::IconType::CAST);
-  DialSinkExtraData extra_data3 = CreateDialSinkExtraData(
-      "model_name3", "192.168.1.3", "https://example3.com");
-
-  std::vector<MediaSinkInternal> new_sinks;
-  new_sinks.push_back(MediaSinkInternal(sink1, extra_data2));
-  new_sinks.push_back(MediaSinkInternal(sink3, extra_data3));
-
-  TestFetchCompleted(old_sinks, new_sinks);
-}
-
 }  // namespace media_router