[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 9b778029530627e63ca792ea57f11021be4dd65d..e05306d1a1718b2b9092d08813b542107b647ea9 100644
--- a/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
+++ b/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
@@ -15,8 +15,10 @@
 #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_router_feature.h"
 #include "chrome/browser/media/router/media_routes_observer.h"
 #include "chrome/browser/media/router/media_sinks_observer.h"
 #include "chrome/browser/media/router/mojo/media_route_controller.h"
@@ -58,11 +60,13 @@ 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),
       current_wake_reason_(MediaRouteProviderWakeReason::TOTAL_COUNT),
+      context_(context),
       weak_factory_(this) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(event_page_tracker_);
@@ -152,7 +156,11 @@ 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 = !media_router::DialLocalDiscoveryEnabled();
+  config->enable_cast_discovery = !media_router::CastDiscoveryEnabled();
+  callback.Run(instance_id_, std::move(config));
   ExecutePendingRequests();
   SyncStateToMediaRouteProvider();
 
@@ -423,6 +431,8 @@ void MediaRouterMojoImpl::ProvideSinks(
     const std::string& provider_name,
     const std::vector<MediaSinkInternal>& sinks) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  DVLOG_WITH_INSTANCE(1) << "OnDialMediaSinkDiscovered found " << sinks.size()
+                         << " devices...";
 
   SetWakeReason(MediaRouteProviderWakeReason::PROVIDE_SINKS);
   RunOrDefer(base::Bind(&MediaRouterMojoImpl::DoProvideSinks,
@@ -997,6 +1007,9 @@ void MediaRouterMojoImpl::SyncStateToMediaRouteProvider() {
     DoEnsureMdnsDiscoveryEnabled();
   }
 #endif
+
+  if (media_router::DialLocalDiscoveryEnabled())
+    StartDiscovery();
 }
 
 void MediaRouterMojoImpl::EventPageWakeComplete(bool success) {
@@ -1062,6 +1075,24 @@ void MediaRouterMojoImpl::OnFirewallCheckComplete(
 }
 #endif
 
+void MediaRouterMojoImpl::StartDiscovery() {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  DVLOG_WITH_INSTANCE(1) << "StartDiscovery";
+
+  if (dial_media_sink_service_)
+    return;
+
+  auto* profile = Profile::FromBrowserContext(context_);
+  if (!profile)
+    return;
+
+  dial_media_sink_service_ =
+      new DialMediaSinkService(base::Bind(&MediaRouterMojoImpl::ProvideSinks,
+                                          base::Unretained(this), "dial"),

[Kevin M, 2017/05/09 17:32:06]

Are there potential lifetime issues in giving an refcounted object an Unretained
callback into |this|?

* OnFetchCompleted() called
* Task posted for OnFetchCompletedWithUiThread() bound to refcounted
MediaSinkService. (Refcount for MSS is now 2.)
* MediaRouterMojoImpl destroyed. (MediaSinkService NOT destroyed, because its
refcount is still positive!)
* MSS::OnFetchCompletedOnUIThread invoked.
* MSS calls sink discovery callback to MediaRouterMojoImpl.
* Use after free crash.

If you agree with this assessment, then a WeakPtr might be in order here.

[zhaobin, 2017/05/10 18:17:34]

Done.

+                               profile->GetRequestContext());
+  dial_media_sink_service_->Start();
+}
+
 void MediaRouterMojoImpl::UpdateMediaSinks(
     const MediaSource::Id& source_id) {
   SetWakeReason(MediaRouteProviderWakeReason::UPDATE_MEDIA_SINKS);