[Media Router] Support dual discovery

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

Index: chrome/browser/media/router/discovery/dial/dial_media_sink_service_proxy.cc
diff --git a/chrome/browser/media/router/discovery/dial/dial_media_sink_service_proxy.cc b/chrome/browser/media/router/discovery/dial/dial_media_sink_service_proxy.cc
index 10801e62a22990df9f86b6cd014d01a1e0c52461..67a865872c2015de032fdab716705dc242aa8362 100644
--- a/chrome/browser/media/router/discovery/dial/dial_media_sink_service_proxy.cc
+++ b/chrome/browser/media/router/discovery/dial/dial_media_sink_service_proxy.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/media/router/discovery/dial/dial_media_sink_service_proxy.h"
 
 #include "chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.h"
+#include "chrome/browser/media/router/discovery/mdns/cast_media_sink_service.h"
 #include "content/public/browser/browser_context.h"
 
 using content::BrowserThread;
@@ -13,8 +14,10 @@ namespace media_router {
 
 DialMediaSinkServiceProxy::DialMediaSinkServiceProxy(
     const MediaSinkService::OnSinksDiscoveredCallback& callback,
+    scoped_refptr<CastMediaSinkService> cast_media_sink_service,
     content::BrowserContext* context)
-    : MediaSinkService(callback) {
+    : MediaSinkService(callback),
+      cast_media_sink_service_(cast_media_sink_service) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   auto* profile = Profile::FromBrowserContext(context);
   request_context_ = profile->GetRequestContext();
@@ -37,6 +40,8 @@ void DialMediaSinkServiceProxy::Stop() {
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&DialMediaSinkServiceProxy::StopOnIOThread, this));
+
+  cast_media_sink_service_ = nullptr;
 }
 
 void DialMediaSinkServiceProxy::SetDialMediaSinkServiceForTest(
@@ -53,7 +58,7 @@ void DialMediaSinkServiceProxy::StartOnIOThread() {
     dial_media_sink_service_ = base::MakeUnique<DialMediaSinkServiceImpl>(
         base::Bind(&DialMediaSinkServiceProxy::OnSinksDiscoveredOnIOThread,
                    this),
-        request_context_.get());
+        cast_media_sink_service_, request_context_.get());
   }
 
   dial_media_sink_service_->Start();