[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_proxy.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/profiles/profile.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"
 #include "extensions/browser/process_manager.h"
 
 #define DVLOG_WITH_INSTANCE(level) \
   DVLOG(level) << "MR #" << instance_id_ << ": "
 
 #define DLOG_WITH_INSTANCE(level) DLOG(level) << "MR #" << instance_id_ << ": "
@@ skipping 15 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),
+      context_(context),
       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
 }
 
 MediaRouterMojoImpl::~MediaRouterMojoImpl() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  if (dial_media_sink_service_proxy_)
+    dial_media_sink_service_proxy_->Stop();
 }
 
 // static
 void MediaRouterMojoImpl::BindToRequest(
     const extensions::Extension* extension,
     content::BrowserContext* context,
     const service_manager::BindSourceInfo& source_info,
     mojom::MediaRouterRequest request) {
   MediaRouterMojoImpl* impl = static_cast<MediaRouterMojoImpl*>(
       MediaRouterFactory::GetApiForBrowserContext(context));
@@ skipping 331 matching lines @@
 
   SetWakeReason(MediaRouteProviderWakeReason::CREATE_MEDIA_ROUTE_CONTROLLER);
   RunOrDefer(base::BindOnce(&MediaRouterMojoImpl::DoCreateMediaRouteController,
                             base::Unretained(this), route_id,
                             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) {
+void MediaRouterMojoImpl::ProvideSinks(const std::string& provider_name,
+                                       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));
+                        base::Unretained(this), provider_name,
+                        std::move(sinks)));

[imcheng, 2017/05/26 01:26:00]

ditto on std::move.

[zhaobin, 2017/05/26 20:59:40]

Use std::move to avoid copy as Mark suggested.

 }
 
 bool MediaRouterMojoImpl::RegisterMediaSinksObserver(
     MediaSinksObserver* observer) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // Create an observer list for the media source and add |observer|
   // to it. Fail if |observer| is already registered.
   const std::string& source_id = observer->source().id();
   std::unique_ptr<MediaSinksQuery>& sinks_query = sinks_queries_[source_id];
@@ skipping 296 matching lines @@
     const std::string& domain,
     const MediaSinkSearchResponseCallback& sink_callback) {
   DVLOG_WITH_INSTANCE(1) << "SearchSinks";
   auto sink_search_criteria = mojom::SinkSearchCriteria::New();
   sink_search_criteria->input = search_input;
   sink_search_criteria->domain = domain;
   media_route_provider_->SearchSinks(
       sink_id, source_id, std::move(sink_search_criteria), sink_callback);
 }
 
-void MediaRouterMojoImpl::DoProvideSinks(
-    const std::string& provider_name,
-    const std::vector<MediaSinkInternal>& sinks) {
+void MediaRouterMojoImpl::DoProvideSinks(const std::string& provider_name,
+                                         std::vector<MediaSinkInternal> sinks) {
   DVLOG_WITH_INSTANCE(1) << "DoProvideSinks";
   media_route_provider_->ProvideSinks(provider_name, sinks);
 }
 
 void MediaRouterMojoImpl::DoCreateMediaRouteController(
     const MediaRoute::Id& route_id,
     mojom::MediaControllerRequest mojo_media_controller_request,
     mojom::MediaStatusObserverPtr mojo_observer) {
   DVLOG_WITH_INSTANCE(1) << "DoCreateMediaRouteController";
   if (!mojo_media_controller_request.is_pending() || !mojo_observer.is_bound())
@@ skipping 231 matching lines @@
 #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::EventPageWakeComplete(bool success) {
   if (success) {
     MediaRouterMojoMetrics::RecordMediaRouteProviderWakeReason(
         current_wake_reason_);
     ClearWakeReason();
     MediaRouterMojoMetrics::RecordMediaRouteProviderWakeup(
         MediaRouteProviderWakeup::SUCCESS);
     return;
@@ skipping 45 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_proxy_) {
+    dial_media_sink_service_proxy_ = new DialMediaSinkServiceProxy(
+        base::Bind(&MediaRouterMojoImpl::ProvideSinks,
+                   weak_factory_.GetWeakPtr(), "dial"),
+        context_);
+  }
+
+  dial_media_sink_service_proxy_->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