[Media Router] Add CastMediaSinkService

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/discovery/mdns/cast_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/profiles/profile.h"
@@ skipping 399 matching lines @@
                             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,
                                        std::vector<MediaSinkInternal> sinks) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  DVLOG_WITH_INSTANCE(1) << "OnDialMediaSinkDiscovered found " << sinks.size()
-                         << " devices...";
+  DVLOG_WITH_INSTANCE(1) << "Provider [" << provider_name << "] fould "

[mark a. foltz, 2017/06/28 07:44:52]

Typo in found

[zhaobin, 2017/07/05 18:01:37]

Done.

+                         << sinks.size() << " devices...";
 
   SetWakeReason(MediaRouteProviderWakeReason::PROVIDE_SINKS);
   RunOrDefer(base::Bind(&MediaRouterMojoImpl::DoProvideSinks,
                         base::Unretained(this), provider_name,
                         std::move(sinks)));
 }
 
 bool MediaRouterMojoImpl::RegisterMediaSinksObserver(
     MediaSinksObserver* observer) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ skipping 558 matching lines @@
   // 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();
+  StartDiscovery();
 }
 
 void MediaRouterMojoImpl::EventPageWakeComplete(bool success) {
   if (success) {
     MediaRouterMojoMetrics::RecordMediaRouteProviderWakeReason(
         current_wake_reason_);
     ClearWakeReason();
     MediaRouterMojoMetrics::RecordMediaRouteProviderWakeup(
         MediaRouteProviderWakeup::SUCCESS);
     return;
@@ skipping 49 matching lines @@
     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_);
+  if (media_router::DialLocalDiscoveryEnabled()) {
+    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();
   }
 
-  dial_media_sink_service_proxy_->Start();
+  if (media_router::CastDiscoveryEnabled()) {
+    if (!cast_media_sink_service_) {
+      cast_media_sink_service_ = new CastMediaSinkService(
+          base::Bind(&MediaRouterMojoImpl::ProvideSinks,
+                     weak_factory_.GetWeakPtr(), "cast"),
+          context_);
+    }
+    cast_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(
@@ skipping 17 matching lines @@
 
 void MediaRouterMojoImpl::OnMediaControllerCreated(
     const MediaRoute::Id& route_id,
     bool success) {
   DVLOG_WITH_INSTANCE(1) << "OnMediaControllerCreated: " << route_id
                          << (success ? " was successful." : " failed.");
   MediaRouterMojoMetrics::RecordMediaRouteControllerCreationResult(success);
 }
 
 }  // namespace media_router