[Media Router] Support dual discovery

chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.cc

 // Copyright 2017 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/discovery/dial/dial_media_sink_service_impl.h"
 
 #include "chrome/browser/media/router/discovery/dial/dial_device_data.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/url_request/url_request_context_getter.h"
@@ skipping 61 matching lines @@
   DCHECK(!description_service_);
   description_service_ = std::move(description_service);
 }
 
 void DialMediaSinkServiceImpl::OnDialDeviceEvent(
     const DialRegistry::DeviceList& devices) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DVLOG(2) << "DialMediaSinkServiceImpl::OnDialDeviceEvent found "
            << devices.size() << " devices";
 
-  current_sinks_.clear();
+  MediaSinkServiceBase::RemoveSinks();

[imcheng, 2017/07/06 22:53:30]

Does Cast care that sinks are being removed from DIAL's perspective?

[zhaobin, 2017/07/10 20:21:15]

I think it is needed in current implementation because we do not remove sinks
from CastMediaSinkService on ChannelError (working on a patch to fix that but
want to land this first).

[imcheng, 2017/07/12 00:51:35]

Ok, so IIUC, once the ChannelError fix is landed, then this won't be necessary?

   current_devices_ = devices;
 
   GetDescriptionService()->GetDeviceDescriptions(devices,
                                                  request_context_.get());
 }
 
 void DialMediaSinkServiceImpl::OnDialError(DialRegistry::DialErrorCode type) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DVLOG(2) << "OnDialError [DialErrorCode]: " << static_cast<int>(type);
 }
@@ skipping 15 matching lines @@
                  MediaSink::IconType::GENERIC);
   DialSinkExtraData extra_data;
   extra_data.app_url = description_data.app_url;
   extra_data.model_name = description_data.model_name;
   std::string ip_address = device_data.device_description_url().host();
   if (!extra_data.ip_address.AssignFromIPLiteral(ip_address)) {
     DVLOG(1) << "Invalid ip_address: " << ip_address;
     return;
   }
 
-  current_sinks_.insert(MediaSinkInternal(sink, extra_data));
-
+  MediaSinkServiceBase::AddSink(MediaSinkInternal(sink, extra_data));
   // Start fetch timer again if device description comes back after
   // |finish_timer_| fires.
   MediaSinkServiceBase::RestartTimer();
 }
 
 void DialMediaSinkServiceImpl::OnDeviceDescriptionError(
     const DialDeviceData& device,
     const std::string& error_message) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DVLOG(2) << "OnDescriptionFetchesError [message]: " << error_message;
 }
 
 void DialMediaSinkServiceImpl::RecordDeviceCounts() {
-  metrics_.RecordDialDeviceCounts(current_sinks_.size(),
+  metrics_.RecordDialDeviceCounts(MediaSinkServiceBase::GetCurrentSinksSize(),
                                   current_devices_.size());
 }
 
 }  // namespace media_router