| 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 13df5309fec6bb8cc54a79863802c75335f56f0f..ec8e696fa07aae9209983e207d7ff18119f3d302 100644
|
| --- a/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
|
| +++ b/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
|
| @@ -16,7 +16,6 @@
|
| #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/event_page_request_manager.h"
|
| #include "chrome/browser/media/router/event_page_request_manager_factory.h"
|
| #include "chrome/browser/media/router/issues_observer.h"
|
| @@ -430,8 +429,8 @@
|
| void MediaRouterMojoImpl::ProvideSinks(const std::string& provider_name,
|
| std::vector<MediaSinkInternal> sinks) {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
| - DVLOG_WITH_INSTANCE(1) << "Provider [" << provider_name << "] found "
|
| - << sinks.size() << " devices...";
|
| + DVLOG_WITH_INSTANCE(1) << "OnDialMediaSinkDiscovered found " << sinks.size()
|
| + << " devices...";
|
|
|
| event_page_request_manager_->RunOrDefer(
|
| base::Bind(&MediaRouterMojoImpl::DoProvideSinks,
|
| @@ -942,7 +941,8 @@
|
| }
|
| #endif
|
|
|
| - StartDiscovery();
|
| + if (media_router::DialLocalDiscoveryEnabled())
|
| + StartDiscovery();
|
| }
|
|
|
| #if defined(OS_WIN)
|
| @@ -976,25 +976,14 @@
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
| DVLOG_WITH_INSTANCE(1) << "StartDiscovery";
|
|
|
| - 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();
|
| - }
|
| -
|
| - 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();
|
| - }
|
| + 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();
|
| }
|
|
|
| void MediaRouterMojoImpl::UpdateMediaSinks(
|
|
|