[Media Router] Support dual discovery

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

Index: chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.cc
diff --git a/chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.cc b/chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.cc
index a87915701ffe68483d1fd043e18e62a2a9525961..09f139610e7c1199311af2c1c5648e75772d8ff6 100644
--- a/chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.cc
+++ b/chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.cc
@@ -79,7 +79,7 @@ void DialMediaSinkServiceImpl::OnDialDeviceEvent(
   DVLOG(2) << "DialMediaSinkServiceImpl::OnDialDeviceEvent found "
            << devices.size() << " devices";
 
-  current_sinks_.clear();
+  MediaSinkServiceBase::RemoveSinks();

[imcheng, 2017/07/06 22:53:30]

Does Cast care that sinks are being removed from DIAL's perspective?

[zhaobin, 2017/07/10 20:21:15]

I think it is needed in current implementation because we do not remove sinks
from CastMediaSinkService on ChannelError (working on a patch to fix that but
want to land this first).

[imcheng, 2017/07/12 00:51:35]

Ok, so IIUC, once the ChannelError fix is landed, then this won't be necessary?

   current_devices_ = devices;
 
   GetDescriptionService()->GetDeviceDescriptions(devices,
@@ -115,8 +115,7 @@ void DialMediaSinkServiceImpl::OnDeviceDescriptionAvailable(
     return;
   }
 
-  current_sinks_.insert(MediaSinkInternal(sink, extra_data));
-
+  MediaSinkServiceBase::AddSink(MediaSinkInternal(sink, extra_data));
   // Start fetch timer again if device description comes back after
   // |finish_timer_| fires.
   MediaSinkServiceBase::RestartTimer();
@@ -130,7 +129,7 @@ void DialMediaSinkServiceImpl::OnDeviceDescriptionError(
 }
 
 void DialMediaSinkServiceImpl::RecordDeviceCounts() {
-  metrics_.RecordDialDeviceCounts(current_sinks_.size(),
+  metrics_.RecordDialDeviceCounts(MediaSinkServiceBase::GetCurrentSinksSize(),
                                   current_devices_.size());
 }