[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..0e1044467c221002e136db7979ec1734caaa280c 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
@@ -5,6 +5,7 @@
 #include "chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.h"
 
 #include "chrome/browser/media/router/discovery/dial/dial_device_data.h"
+#include "chrome/browser/media/router/discovery/mdns/cast_media_sink_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/url_request/url_request_context_getter.h"
@@ -15,8 +16,11 @@ namespace media_router {
 
 DialMediaSinkServiceImpl::DialMediaSinkServiceImpl(
     const OnSinksDiscoveredCallback& callback,
+    scoped_refptr<CastMediaSinkService> cast_media_sink_service,
     net::URLRequestContextGetter* request_context)
-    : MediaSinkServiceBase(callback), request_context_(request_context) {
+    : MediaSinkServiceBase(callback),
+      cast_media_sink_service_(cast_media_sink_service),
+      request_context_(request_context) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(request_context_);
 }
@@ -81,6 +85,8 @@ void DialMediaSinkServiceImpl::OnDialDeviceEvent(
 
   current_sinks_.clear();
   current_devices_ = devices;
+  if (cast_media_sink_service_)
+    cast_media_sink_service_->OnDialSinksRemoved();

[mark a. foltz, 2017/07/11 23:52:50]

It looks like the DMSS doesn't need to take a dependency directly onto
CastMediaSinkService.  This can be captured by factoring out a
DialMediaSinkServiceDelegate interface that contains only OnDialSinksRemoved()
and OnDialSinkAdded(), and having CMSS implement that.

 
   GetDescriptionService()->GetDeviceDescriptions(devices,
                                                  request_context_.get());
@@ -115,7 +121,10 @@ void DialMediaSinkServiceImpl::OnDeviceDescriptionAvailable(
     return;
   }
 
-  current_sinks_.insert(MediaSinkInternal(sink, extra_data));
+  MediaSinkInternal dial_sink(sink, extra_data);
+  current_sinks_.insert(dial_sink);
+  if (cast_media_sink_service_)
+    cast_media_sink_service_->OnDialSinkAdded(dial_sink);
 
   // Start fetch timer again if device description comes back after
   // |finish_timer_| fires.