[Media Router] Use DialMediaSinkService in MediaRouterMojoImpl

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 13 matching lines @@
 DialMediaSinkServiceImpl::~DialMediaSinkServiceImpl() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   Stop();
 }
 
 void DialMediaSinkServiceImpl::Start() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (dial_registry_)
     return;
 
-  dial_registry_ = DialRegistry::GetInstance();
+  dial_registry_ =
+      test_dial_registry_ ? test_dial_registry_ : DialRegistry::GetInstance();
   dial_registry_->RegisterObserver(this);
   dial_registry_->OnListenerAdded();
+  MediaSinkServiceBase::StartTimer();
 }
 
 void DialMediaSinkServiceImpl::Stop() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (!dial_registry_)
     return;
 
   dial_registry_->OnListenerRemoved();
   dial_registry_->UnregisterObserver(this);
   dial_registry_ = nullptr;
+  MediaSinkServiceBase::StopTimer();
 }
 
 DeviceDescriptionService* DialMediaSinkServiceImpl::GetDescriptionService() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (!description_service_.get()) {
     description_service_.reset(new DeviceDescriptionService(
         base::Bind(&DialMediaSinkServiceImpl::OnDeviceDescriptionAvailable,
                    base::Unretained(this)),
         base::Bind(&DialMediaSinkServiceImpl::OnDeviceDescriptionError,
                    base::Unretained(this))));
   }
   return description_service_.get();
 }
 
 void DialMediaSinkServiceImpl::SetDialRegistryForTest(
     DialRegistry* dial_registry) {
-  DCHECK(!dial_registry_);
-  dial_registry_ = dial_registry;
-
-  DCHECK(dial_registry);
-  dial_registry_->RegisterObserver(this);
-  dial_registry_->OnListenerAdded();
+  DCHECK(!test_dial_registry_);
+  test_dial_registry_ = dial_registry;
 }
 
 void DialMediaSinkServiceImpl::SetDescriptionServiceForTest(
     std::unique_ptr<DeviceDescriptionService> description_service) {
   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";
 
-  // Timer starts in |OnDialDeviceEvent()|, and expires 3 seconds later. If
-  // |OnDeviceDescriptionAvailable()| is called after |finish_timer_| expires,
-  // |finish_timer_| is restarted.
-  StartTimer();
-
   current_sinks_.clear();
   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 20 matching lines @@
   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));
 
   // Start fetch timer again if device description comes back after
   // |finish_timer_| fires.
-  if (!finish_timer_->IsRunning())
-    StartTimer();
+  MediaSinkServiceBase::RestartTimer();
 }
 
 void DialMediaSinkServiceImpl::OnDeviceDescriptionError(
     const DialDeviceData& device,
     const std::string& error_message) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DVLOG(2) << "OnDescriptionFetchesError [message]: " << error_message;
 }
 
 }  // namespace media_router