[Media Router] Add CastMediaSinkService

chrome/browser/media/router/mojo/media_router_mojo_impl.cc

Index: chrome/browser/media/router/mojo/media_router_mojo_impl.cc
diff --git a/chrome/browser/media/router/mojo/media_router_mojo_impl.cc b/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
index e101f47c7322a3760f03919c4094bc2c294644f4..4833f91575aa96a66b03eee032af54831a135162 100644
--- a/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
+++ b/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
@@ -16,6 +16,7 @@
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/media/router/discovery/dial/dial_media_sink_service_proxy.h"
+#include "chrome/browser/media/router/discovery/mdns/cast_media_sink_service.h"
 #include "chrome/browser/media/router/issues_observer.h"
 #include "chrome/browser/media/router/media_router_factory.h"
 #include "chrome/browser/media/router/media_router_feature.h"
@@ -435,8 +436,8 @@ scoped_refptr<MediaRouteController> MediaRouterMojoImpl::GetRouteController(
 void MediaRouterMojoImpl::ProvideSinks(const std::string& provider_name,
                                        std::vector<MediaSinkInternal> sinks) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  DVLOG_WITH_INSTANCE(1) << "OnDialMediaSinkDiscovered found " << sinks.size()
-                         << " devices...";
+  DVLOG_WITH_INSTANCE(1) << "Provider [" << provider_name << "] fould "

[mark a. foltz, 2017/06/28 07:44:52]

Typo in found

[zhaobin, 2017/07/05 18:01:37]

Done.

+                         << sinks.size() << " devices...";
 
   SetWakeReason(MediaRouteProviderWakeReason::PROVIDE_SINKS);
   RunOrDefer(base::Bind(&MediaRouterMojoImpl::DoProvideSinks,
@@ -1015,8 +1016,7 @@ void MediaRouterMojoImpl::SyncStateToMediaRouteProvider() {
   }
 #endif
 
-  if (media_router::DialLocalDiscoveryEnabled())
-    StartDiscovery();
+  StartDiscovery();
 }
 
 void MediaRouterMojoImpl::EventPageWakeComplete(bool success) {
@@ -1086,14 +1086,25 @@ void MediaRouterMojoImpl::StartDiscovery() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DVLOG_WITH_INSTANCE(1) << "StartDiscovery";
 
-  if (!dial_media_sink_service_proxy_) {
-    dial_media_sink_service_proxy_ = new DialMediaSinkServiceProxy(
-        base::Bind(&MediaRouterMojoImpl::ProvideSinks,
-                   weak_factory_.GetWeakPtr(), "dial"),
-        context_);
+  if (media_router::DialLocalDiscoveryEnabled()) {
+    if (!dial_media_sink_service_proxy_) {
+      dial_media_sink_service_proxy_ = new DialMediaSinkServiceProxy(
+          base::Bind(&MediaRouterMojoImpl::ProvideSinks,
+                     weak_factory_.GetWeakPtr(), "dial"),
+          context_);
+    }
+    dial_media_sink_service_proxy_->Start();
   }
 
-  dial_media_sink_service_proxy_->Start();
+  if (media_router::CastDiscoveryEnabled()) {
+    if (!cast_media_sink_service_) {
+      cast_media_sink_service_ = new CastMediaSinkService(
+          base::Bind(&MediaRouterMojoImpl::ProvideSinks,
+                     weak_factory_.GetWeakPtr(), "cast"),
+          context_);
+    }
+    cast_media_sink_service_->Start();
+  }
 }
 
 void MediaRouterMojoImpl::UpdateMediaSinks(