[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..a02926dd427563c13a5f44a04347c17a4274544a 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,14 @@ void RunRouteRequestCallbacks(
 
 }  // namespace
 
+// Controls if browser side DIAL device discovery is enabled.
+const base::Feature kEnableDialLocalDiscovery{
+    "EnableDialLocalDiscovery", base::FEATURE_DISABLED_BY_DEFAULT};
+
+// Controls if browser side Cast device discovery is enabled.
+const base::Feature kEnableCastDiscovery{"EnableCastDiscovery",
+                                         base::FEATURE_DISABLED_BY_DEFAULT};
+
 using SinkAvailability = mojom::MediaRouter::SinkAvailability;
 
 MediaRouterMojoImpl::MediaRoutesQuery::MediaRoutesQuery() = default;
@@ -58,7 +67,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 +81,7 @@ MediaRouterMojoImpl::MediaRouterMojoImpl(
       base::Bind(&MediaRouterMojoImpl::OnFirewallCheckComplete,
                  weak_factory_.GetWeakPtr()));
 #endif
+  context_ = context;
 }
 
 MediaRouterMojoImpl::~MediaRouterMojoImpl() {
@@ -87,6 +98,19 @@ void MediaRouterMojoImpl::BindToRequest(
   DCHECK(impl);
 
   impl->BindToMojoRequest(std::move(request), *extension);
+
+  if (!base::FeatureList::IsEnabled(kEnableDialLocalDiscovery))
+    return;
+
+  auto* profile = Profile::FromBrowserContext(context);

[mark a. foltz, 2017/05/01 20:32:57]

Can the rest of this method be factored into StartDiscoveryOnIOThread()?

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

Done.

+  auto* request_context = profile ? profile->GetRequestContext() : nullptr;
+  if (!request_context)
+    return;
+
+  content::BrowserThread::PostTask(
+      content::BrowserThread::IO, FROM_HERE,
+      base::Bind(&MediaRouterMojoImpl::StartBrowserSideDiscovery,
+                 base::Unretained(impl), request_context));
 }
 
 void MediaRouterMojoImpl::BindToMojoRequest(
@@ -151,7 +175,13 @@ 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_);
+
+  auto config = mojom::MediaRouteProviderConfig::New();
+  config->enable_dial_discovery =
+      !base::FeatureList::IsEnabled(kEnableDialLocalDiscovery);

[mark a. foltz, 2017/05/01 20:32:57]

Nice :)

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

Acknowledged.

+  config->enable_cast_discovery =
+      !base::FeatureList::IsEnabled(kEnableCastDiscovery);
+  callback.Run(instance_id_, std::move(config));
   ExecutePendingRequests();
   wakeup_attempt_count_ = 0;
 #if defined(OS_WIN)
@@ -1037,6 +1067,30 @@ void MediaRouterMojoImpl::OnFirewallCheckComplete(
 }
 #endif
 
+void MediaRouterMojoImpl::StartBrowserSideDiscovery(
+    net::URLRequestContextGetter* request_context) {
+  DVLOG_WITH_INSTANCE(1) << "StartBrowserSideDiscovery";

[mark a. foltz, 2017/05/01 20:32:57]

DCHECK that this is running on the IO thread.

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

Done.

+
+  if (dial_media_sink_service_)
+    return;
+
+  dial_media_sink_service_.reset(new DialMediaSinkService(

[mark a. foltz, 2017/05/01 20:32:57]

= MakeUnique<>()

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

dial_media_sink_service_ is a scoped_refptr now...

+      base::Bind(&MediaRouterMojoImpl::OnDialMediaSinkDiscovered,
+                 base::Unretained(this)),
+      request_context));
+  dial_media_sink_service_->Start();
+}
+
+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));
+}
+
 void MediaRouterMojoImpl::UpdateMediaSinks(
     const MediaSource::Id& source_id) {
   SetWakeReason(MediaRouteProviderWakeReason::UPDATE_MEDIA_SINKS);