[Media Router] Use DialMediaSinkService in MediaRouterMojoImpl

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 48b99eb88f9c02d0cdf89716adb6692cf2aa53d6..b37cae577714329d66450b92a56693032e449d59 100644
--- a/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
+++ b/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
@@ -15,6 +15,7 @@
 #include "base/observer_list.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
+#include "chrome/browser/media/router/discovery/dial/dial_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_routes_observer.h"
@@ -47,6 +48,12 @@ void RunRouteRequestCallbacks(
 
 }  // namespace
 
+#if !defined(OS_ANDROID)
+// Controls if browser side device discovery is enabled.
+const base::Feature kEnableBrowserSideDiscovery{
+    "EnableBrowserSideDiscovery", base::FEATURE_DISABLED_BY_DEFAULT};

[mark a. foltz, 2017/04/26 23:52:55]

EnableDialLocalDiscovery ?

[zhaobin, 2017/05/03 01:53:59]

Done.

+#endif
+
 using SinkAvailability = mojom::MediaRouter::SinkAvailability;
 
 MediaRouterMojoImpl::MediaRoutesQuery::MediaRoutesQuery() = default;
@@ -58,7 +65,8 @@ MediaRouterMojoImpl::MediaSinksQuery::MediaSinksQuery() = default;
 MediaRouterMojoImpl::MediaSinksQuery::~MediaSinksQuery() = default;
 
 MediaRouterMojoImpl::MediaRouterMojoImpl(
-    extensions::EventPageTracker* event_page_tracker)
+    extensions::EventPageTracker* event_page_tracker,
+    content::BrowserContext* context)
     : event_page_tracker_(event_page_tracker),
       instance_id_(base::GenerateGUID()),
       availability_(mojom::MediaRouter::SinkAvailability::UNAVAILABLE),
@@ -71,6 +79,9 @@ MediaRouterMojoImpl::MediaRouterMojoImpl(
       base::Bind(&MediaRouterMojoImpl::OnFirewallCheckComplete,
                  weak_factory_.GetWeakPtr()));
 #endif
+  context_ = context;
+  enable_browser_side_discovery_ =
+      base::FeatureList::IsEnabled(kEnableBrowserSideDiscovery);
 }
 
 MediaRouterMojoImpl::~MediaRouterMojoImpl() {
@@ -87,6 +98,11 @@ void MediaRouterMojoImpl::BindToRequest(
   DCHECK(impl);
 
   impl->BindToMojoRequest(std::move(request), *extension);
+
+#if !defined(OS_ANDROID)
+  if (impl->enable_browser_side_discovery_)
+    impl->StartBrowserSideDiscovery();
+#endif
 }
 
 void MediaRouterMojoImpl::BindToMojoRequest(
@@ -151,7 +167,7 @@ void MediaRouterMojoImpl::RegisterMediaRouteProvider(
   media_route_provider_ = std::move(media_route_provider_ptr);
   media_route_provider_.set_connection_error_handler(base::Bind(
       &MediaRouterMojoImpl::OnConnectionError, base::Unretained(this)));
-  callback.Run(instance_id_);
+  callback.Run(instance_id_, enable_browser_side_discovery_);
   ExecutePendingRequests();
   wakeup_attempt_count_ = 0;
 #if defined(OS_WIN)
@@ -1037,6 +1053,34 @@ void MediaRouterMojoImpl::OnFirewallCheckComplete(
 }
 #endif
 
+#if !defined(OS_ANDROID)
+void MediaRouterMojoImpl::StartBrowserSideDiscovery() {
+  if (dial_media_sink_service_)
+    return;
+
+  dial_media_sink_service_.reset(new DialMediaSinkService(
+      base::Bind(&MediaRouterMojoImpl::OnDialMediaSinkDiscovered,
+                 base::Unretained(this)),
+      context_));
+
+  content::BrowserThread::PostTask(
+      content::BrowserThread::IO, FROM_HERE,
+      base::Bind(&DialMediaSinkService::Start,
+                 base::Unretained(dial_media_sink_service_.get())));
+}
+
+void MediaRouterMojoImpl::OnDialMediaSinkDiscovered(
+    const std::vector<MediaSinkInternal>& sinks) {
+  DVLOG_WITH_INSTANCE(1) << "OnDialMediaSinkDiscovered found " << sinks.size()
+                         << " devices...";
+  content::BrowserThread::PostTask(
+      content::BrowserThread::UI, FROM_HERE,
+      base::Bind(&MediaRouterMojoImpl::ProvideSinks, base::Unretained(this),
+                 "dial", sinks));
+}
+
+#endif
+
 void MediaRouterMojoImpl::UpdateMediaSinks(
     const MediaSource::Id& source_id) {
   SetWakeReason(MediaRouteProviderWakeReason::UPDATE_MEDIA_SINKS);