[Media Router] Use DialMediaSinkService in MediaRouterMojoImpl

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_impl_unittest.cc b/chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl_unittest.cc
index 6f3b591d2a320e691974072c2a4d03809552b79a..c99e49001fd0c7cad4152d531b3812768f5ce0fb 100644
--- a/chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl_unittest.cc
+++ b/chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl_unittest.cc
@@ -51,10 +51,6 @@ class DialMediaSinkServiceImplTest : public ::testing::Test {
                                          profile_.GetRequestContext())) {}
 
   void SetUp() override {
-    EXPECT_CALL(test_dial_registry_,
-                RegisterObserver(media_sink_service_.get()));
-    EXPECT_CALL(test_dial_registry_, OnListenerAdded());
-
     media_sink_service_->SetDialRegistryForTest(&test_dial_registry_);
 
     auto mock_description_service =
@@ -69,9 +65,6 @@ class DialMediaSinkServiceImplTest : public ::testing::Test {
   }
 
   void TearDown() override {
-    EXPECT_CALL(test_dial_registry_,
-                UnregisterObserver(media_sink_service_.get()));
-    EXPECT_CALL(test_dial_registry_, OnListenerRemoved());
   }
 
  protected:
@@ -96,26 +89,6 @@ class DialMediaSinkServiceImplTest : public ::testing::Test {
   DISALLOW_COPY_AND_ASSIGN(DialMediaSinkServiceImplTest);
 };
 
-TEST_F(DialMediaSinkServiceImplTest, TestStart) {
-  media_sink_service_->Start();
-
-  DialRegistry::DeviceList deviceList;
-  DialDeviceData first_device("first", GURL("http://127.0.0.1/dd.xml"),
-                              base::Time::Now());
-  DialDeviceData second_device("second", GURL("http://127.0.0.2/dd.xml"),
-                               base::Time::Now());
-  DialDeviceData third_device("third", GURL("http://127.0.0.3/dd.xml"),
-                              base::Time::Now());
-  deviceList.push_back(first_device);
-  deviceList.push_back(second_device);
-  deviceList.push_back(third_device);
-
-  EXPECT_CALL(*mock_description_service_, GetDeviceDescriptions(deviceList, _));
-
-  media_sink_service_->OnDialDeviceEvent(deviceList);
-  EXPECT_TRUE(media_sink_service_->finish_timer_->IsRunning());
-}
-
 TEST_F(DialMediaSinkServiceImplTest, TestOnDeviceDescriptionAvailable) {
   DialDeviceData device_data("first", GURL("http://127.0.0.1/dd.xml"),
                              base::Time::Now());
@@ -167,4 +140,27 @@ TEST_F(DialMediaSinkServiceImplTest, TestTimer) {
   EXPECT_TRUE(mock_timer_->IsRunning());
 }
 
+TEST_F(DialMediaSinkServiceImplTest, TestRestartAfterStop) {
+  EXPECT_CALL(test_dial_registry_, RegisterObserver(media_sink_service_.get()))
+      .Times(2);
+  EXPECT_CALL(test_dial_registry_, OnListenerAdded()).Times(2);
+  media_sink_service_->Start();
+  EXPECT_TRUE(mock_timer_->IsRunning());
+
+  EXPECT_CALL(test_dial_registry_,
+              UnregisterObserver(media_sink_service_.get()));
+  EXPECT_CALL(test_dial_registry_, OnListenerRemoved());
+  media_sink_service_->Stop();
+
+  mock_timer_ =
+      new base::MockTimer(true /*retain_user_task*/, false /*is_repeating*/);
+  media_sink_service_->SetTimerForTest(base::WrapUnique(mock_timer_));
+  media_sink_service_->Start();
+  EXPECT_TRUE(mock_timer_->IsRunning());
+
+  EXPECT_CALL(test_dial_registry_,
+              UnregisterObserver(media_sink_service_.get()));
+  EXPECT_CALL(test_dial_registry_, OnListenerRemoved());
+}
+
 }  // namespace media_router