Index: chrome/browser/media/router/discovery/dial/dial_media_sink_service.cc |
diff --git a/chrome/browser/media/router/discovery/dial/dial_media_sink_service.cc b/chrome/browser/media/router/discovery/dial/dial_media_sink_service.cc |
index 562dcd5b8a213b51bed1f6e38abd4a3ed215c299..6639b8cf88849655280e2d87dce085a861417c75 100644 |
--- a/chrome/browser/media/router/discovery/dial/dial_media_sink_service.cc |
+++ b/chrome/browser/media/router/discovery/dial/dial_media_sink_service.cc |
@@ -22,26 +22,24 @@ DialMediaSinkService::DialMediaSinkService( |
const OnSinksDiscoveredCallback& callback, |
net::URLRequestContextGetter* request_context) |
: MediaSinkService(callback), request_context_(request_context) { |
- DCHECK_CURRENTLY_ON(BrowserThread::IO); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
DCHECK(request_context_); |
} |
DialMediaSinkService::~DialMediaSinkService() {} |
mark a. foltz
2017/05/09 18:21:13
There needs to be some guarantees that the followi
zhaobin
2017/05/10 18:17:34
Marked DialMediaSinkService as content::BrowserThr
|
void DialMediaSinkService::Start() { |
- DCHECK_CURRENTLY_ON(BrowserThread::IO); |
- dial_registry()->RegisterObserver(this); |
- dial_registry()->StartPeriodicDiscovery(); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
+ content::BrowserThread::PostTask( |
+ content::BrowserThread::IO, FROM_HERE, |
+ base::Bind(&DialMediaSinkService::StartOnIOThread, this)); |
} |
void DialMediaSinkService::Stop() { |
- DCHECK_CURRENTLY_ON(BrowserThread::IO); |
- dial_registry()->UnregisterObserver(this); |
-} |
- |
-DialRegistry* DialMediaSinkService::dial_registry() { |
- DCHECK_CURRENTLY_ON(BrowserThread::IO); |
- return DialRegistry::GetInstance(); |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
+ content::BrowserThread::PostTask( |
+ content::BrowserThread::IO, FROM_HERE, |
+ base::Bind(&DialMediaSinkService::StopOnIOThread, this)); |
} |
DeviceDescriptionService* DialMediaSinkService::GetDescriptionService() { |
@@ -56,18 +54,67 @@ DeviceDescriptionService* DialMediaSinkService::GetDescriptionService() { |
return description_service_.get(); |
} |
+void DialMediaSinkService::SetDialRegistryForTest(DialRegistry* dial_registry) { |
+ dial_registry_ = dial_registry; |
+} |
+ |
+void DialMediaSinkService::SetDescriptionServiceForTest( |
+ std::unique_ptr<DeviceDescriptionService> description_service) { |
+ description_service_ = std::move(description_service); |
+} |
+ |
+void DialMediaSinkService::SetTimerForTest(std::unique_ptr<base::Timer> timer) { |
+ finish_timer_ = std::move(timer); |
+} |
+ |
+void DialMediaSinkService::StartOnIOThread() { |
+ DCHECK_CURRENTLY_ON(BrowserThread::IO); |
+ // Create a finish timer. |
+ if (!finish_timer_) |
+ finish_timer_.reset(new base::OneShotTimer()); |
+ |
+ if (!dial_registry_) |
+ dial_registry_ = DialRegistry::GetInstance(); |
+ |
+ dial_registry_->RegisterObserver(this); |
+ dial_registry_->OnListenerAdded(); |
+} |
+ |
+void DialMediaSinkService::StopOnIOThread() { |
+ DCHECK_CURRENTLY_ON(BrowserThread::IO); |
+ if (!dial_registry_) |
Kevin M
2017/05/09 17:32:06
Assuming the service was Start()ed, then is it pos
zhaobin
2017/05/10 18:17:34
Will change this to DCHECK. DCHECK(xxx) should be
|
+ return; |
+ |
+ dial_registry_->OnListenerRemoved(); |
+ dial_registry_->UnregisterObserver(this); |
+} |
+ |
+void DialMediaSinkService::OnFetchCompletedOnUIThread() { |
+ DCHECK_CURRENTLY_ON(BrowserThread::UI); |
+ if (current_sinks_ == mrp_sinks_) { |
+ DVLOG(2) << "No update to sink list."; |
+ return; |
+ } |
+ |
+ auto sinks = current_sinks_; |
+ DVLOG(2) << "Send sinks to media router, [size]: " << sinks.size(); |
+ sink_discovery_callback_.Run( |
+ std::vector<MediaSinkInternal>(sinks.begin(), sinks.end())); |
+ mrp_sinks_ = std::move(sinks); |
+} |
+ |
void DialMediaSinkService::OnDialDeviceEvent( |
const DialRegistry::DeviceList& devices) { |
DCHECK_CURRENTLY_ON(BrowserThread::IO); |
DVLOG(2) << "DialMediaSinkService::OnDialDeviceEvent found " << devices.size() |
<< " devices"; |
- // Add a finish timer. |
- finish_timer_.reset(new base::OneShotTimer()); |
+ DCHECK(finish_timer_); |
base::TimeDelta finish_delay = |
Kevin M
2017/05/09 17:32:05
Suggestion: refactor these calls into a method "Re
Kevin M
2017/05/09 17:32:06
This code resets the timer for every DIAL event, s
zhaobin
2017/05/10 18:17:34
Done.
zhaobin
2017/05/10 18:17:34
Yes. DIAL event is not for the *last* record. It r
|
base::TimeDelta::FromSeconds(kFetchCompleteTimeoutSecs); |
- finish_timer_->Start(FROM_HERE, finish_delay, this, |
- &DialMediaSinkService::OnFetchCompleted); |
+ finish_timer_->Start(FROM_HERE, finish_delay, |
+ base::Bind(&DialMediaSinkService::OnFetchCompleted, |
+ base::Unretained(this))); |
current_sinks_.clear(); |
mark a. foltz
2017/05/09 18:21:13
This is being called on the IO thread, but current
zhaobin
2017/05/10 18:17:34
Created a delegate to handle thread hopping. DialM
|
current_devices_ = devices; |
@@ -107,16 +154,17 @@ void DialMediaSinkService::OnDeviceDescriptionAvailable( |
current_sinks_.insert(MediaSinkInternal(sink, extra_data)); |
mark a. foltz
2017/05/09 18:21:13
Ditto. This class could be redesigned to pass the
zhaobin
2017/05/10 18:17:34
Done.
|
- if (finish_timer_) |
+ DCHECK(finish_timer_); |
+ if (finish_timer_->IsRunning()) |
return; |
// Start fetch timer again if device description comes back after |
// |finish_timer_| fires. |
base::TimeDelta finish_delay = |
base::TimeDelta::FromSeconds(kFetchCompleteTimeoutSecs); |
- finish_timer_.reset(new base::OneShotTimer()); |
- finish_timer_->Start(FROM_HERE, finish_delay, this, |
- &DialMediaSinkService::OnFetchCompleted); |
+ finish_timer_->Start(FROM_HERE, finish_delay, |
+ base::Bind(&DialMediaSinkService::OnFetchCompleted, |
+ base::Unretained(this))); |
} |
void DialMediaSinkService::OnDeviceDescriptionError( |
@@ -130,18 +178,9 @@ void DialMediaSinkService::OnFetchCompleted() { |
DCHECK_CURRENTLY_ON(BrowserThread::IO); |
DCHECK(!sink_discovery_callback_.is_null()); |
- finish_timer_.reset(); |
- |
- auto sinks = current_sinks_; |
- if (sinks == mrp_sinks_) { |
- DVLOG(2) << "No update to sink list."; |
- return; |
- } |
- |
- DVLOG(2) << "Send sinks to media router, [size]: " << sinks.size(); |
- sink_discovery_callback_.Run( |
- std::vector<MediaSinkInternal>(sinks.begin(), sinks.end())); |
- mrp_sinks_ = std::move(sinks); |
+ content::BrowserThread::PostTask( |
+ content::BrowserThread::UI, FROM_HERE, |
+ base::Bind(&DialMediaSinkService::OnFetchCompletedOnUIThread, this)); |
} |
} // namespace media_router |