[Media Router] Use DialMediaSinkService in MediaRouterMojoImpl

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media/router/mojo/media_router_mojo_impl.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #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"
 #include "chrome/browser/media/router/media_sinks_observer.h"
 #include "chrome/browser/media/router/mojo/media_route_controller.h"
 #include "chrome/browser/media/router/mojo/media_route_provider_util_win.h"
 #include "chrome/browser/media/router/mojo/media_router_mojo_metrics.h"
 #include "chrome/browser/media/router/route_message_observer.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/common/media_router/media_source_helper.h"
@@ skipping 12 matching lines @@
 
 void RunRouteRequestCallbacks(
     std::unique_ptr<RouteRequestResult> result,
     const std::vector<MediaRouteResponseCallback>& callbacks) {
   for (const MediaRouteResponseCallback& callback : callbacks)
     callback.Run(*result);
 }
 
 }  // 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;
 
 MediaRouterMojoImpl::MediaRoutesQuery::~MediaRoutesQuery() = default;
 
 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),
       weak_factory_(this) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(event_page_tracker_);
 #if defined(OS_WIN)
   CanFirewallUseLocalPorts(
       base::Bind(&MediaRouterMojoImpl::OnFirewallCheckComplete,
                  weak_factory_.GetWeakPtr()));
 #endif
+  context_ = context;
 }
 
 MediaRouterMojoImpl::~MediaRouterMojoImpl() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 }
 
 // static
 void MediaRouterMojoImpl::BindToRequest(
     const extensions::Extension* extension,
     content::BrowserContext* context,
     mojo::InterfaceRequest<mojom::MediaRouter> request) {
   MediaRouterMojoImpl* impl = static_cast<MediaRouterMojoImpl*>(
       MediaRouterFactory::GetApiForBrowserContext(context));
   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(
     mojo::InterfaceRequest<mojom::MediaRouter> request,
     const extensions::Extension& extension) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   binding_.reset(
       new mojo::Binding<mojom::MediaRouter>(this, std::move(request)));
   binding_->set_connection_error_handler(base::Bind(
@@ skipping 44 matching lines @@
            "suspended.";
     media_route_provider_.reset();
     SetWakeReason(MediaRouteProviderWakeReason::REGISTER_MEDIA_ROUTE_PROVIDER);
     AttemptWakeEventPage();
     return;
   }
 
   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)
   // The MRPM extension already turns on mDNS discovery for platforms other than
   // Windows. It only relies on this signalling from MR on Windows to avoid
   // triggering a firewall prompt out of the context of MR from the user's
   // perspective. This particular call reminds the extension to enable mDNS
   // discovery when it wakes up, has been upgraded, etc.
   if (should_enable_mdns_discovery_) {
     DoEnsureMdnsDiscoveryEnabled();
@@ skipping 865 matching lines @@
   }
 }
 
 void MediaRouterMojoImpl::OnFirewallCheckComplete(
     bool firewall_can_use_local_ports) {
   if (firewall_can_use_local_ports)
     EnsureMdnsDiscoveryEnabled();
 }
 #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);
   RunOrDefer(base::BindOnce(&MediaRouterMojoImpl::DoUpdateMediaSinks,
                             base::Unretained(this), source_id));
 }
 
 void MediaRouterMojoImpl::DoUpdateMediaSinks(
     const MediaSource::Id& source_id) {
   DVLOG_WITH_INSTANCE(1) << "DoUpdateMediaSinks: " << source_id;
@@ skipping 15 matching lines @@
 
 void MediaRouterMojoImpl::OnMediaControllerCreated(
     const MediaRoute::Id& route_id,
     bool success) {
   // TODO(takumif): Record success/failure with UMA.
   DVLOG_WITH_INSTANCE(1) << "OnMediaControllerCreated: " << route_id
                          << (success ? " was successful." : " failed.");
 }
 
 }  // namespace media_router