[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_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"
 #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"
 #include "chrome/common/media_router/route_message.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 21 matching lines @@
 
 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;

[Kevin M, 2017/05/03 21:07:27]

Put this in the initialization list?

[zhaobin, 2017/05/04 23:52:36]

Done.

 }
 
 MediaRouterMojoImpl::~MediaRouterMojoImpl() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 }
 
 // static
 void MediaRouterMojoImpl::BindToRequest(
     const extensions::Extension* extension,
     content::BrowserContext* context,
@@ skipping 60 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 = !media_router::DialLocalDiscoveryEnabled();

[Kevin M, 2017/05/03 21:07:27]

Eh??? This doesn't make sense - you're setting an enabled flag to the negative
of another enabled flag??

[zhaobin, 2017/05/04 23:52:36]

Yes. config->enable_dial_discovery controls extension discovery;
media_router::DialLocalDiscoveryEnabled() controls browser side discovery. If
browser side discovery is enabled, disable extension discovery.

+  config->enable_cast_discovery = !media_router::CastDiscoveryEnabled();
+  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();
   }
 #endif
+
+  if (media_router::DialLocalDiscoveryEnabled())
+    StartDiscovery();
 }
 
 void MediaRouterMojoImpl::OnIssue(const IssueInfo& issue) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DVLOG_WITH_INSTANCE(1) << "OnIssue " << issue.title;
   issue_manager_.AddIssue(issue);
 }
 
 void MediaRouterMojoImpl::OnSinksReceived(
     const std::string& media_source,
@@ skipping 246 matching lines @@
                             std::move(mojo_media_controller_request),
                             route_controller->BindObserverPtr()));
   route_controllers_.emplace(route_id, route_controller.get());
   return route_controller;
 }
 
 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,
                         base::Unretained(this), provider_name, sinks));
 }
 
 bool MediaRouterMojoImpl::RegisterMediaSinksObserver(
     MediaSinksObserver* observer) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
@@ skipping 587 matching lines @@
   }
 }
 
 void MediaRouterMojoImpl::OnFirewallCheckComplete(
     bool firewall_can_use_local_ports) {
   if (firewall_can_use_local_ports)
     EnsureMdnsDiscoveryEnabled();
 }
 #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"),
+                               profile->GetRequestContext());
+  dial_media_sink_service_->Start();
+}
+
 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