[Media Router] Support dual discovery

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

Index: chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.h
diff --git a/chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.h b/chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.h
index e238bc4ed7de4679807f3c1ba538b5642fea9592..a05898df8fa321912c2dc6f01ae2dec3a87fc663 100644
--- a/chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.h
+++ b/chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.h
@@ -15,6 +15,7 @@
 
 namespace media_router {
 
+class CastMediaSinkService;
 class DeviceDescriptionService;
 class DialRegistry;
 
@@ -24,8 +25,10 @@ class DialRegistry;
 class DialMediaSinkServiceImpl : public MediaSinkServiceBase,
                                  public DialRegistry::Observer {
  public:
-  DialMediaSinkServiceImpl(const OnSinksDiscoveredCallback& callback,
-                           net::URLRequestContextGetter* request_context);
+  DialMediaSinkServiceImpl(
+      const OnSinksDiscoveredCallback& callback,
+      scoped_refptr<CastMediaSinkService> cast_media_sink_service,

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

Since the CMSS is optional for the DialMediaSinkService to function, I would
prefer that it be passed through a setter on the DMSS.
This would remove the need to pass nullptr in the unit tests.

+      net::URLRequestContextGetter* request_context);
   ~DialMediaSinkServiceImpl() override;
 
   // MediaSinkService implementation
@@ -78,6 +81,8 @@ class DialMediaSinkServiceImpl : public MediaSinkServiceBase,
   // Device data list from current round of discovery.
   DialRegistry::DeviceList current_devices_;
 
+  scoped_refptr<CastMediaSinkService> cast_media_sink_service_;
+
   scoped_refptr<net::URLRequestContextGetter> request_context_;
 
   MediaRouterMetrics metrics_;