| Index: net/nqe/network_qualities_prefs_manager.cc
|
| diff --git a/net/nqe/network_qualities_prefs_manager.cc b/net/nqe/network_qualities_prefs_manager.cc
|
| index 82e22c47a4476ce8e18297b78237d454fd043d00..94c7e1547280ad72707869f103a5a70e281757b7 100644
|
| --- a/net/nqe/network_qualities_prefs_manager.cc
|
| +++ b/net/nqe/network_qualities_prefs_manager.cc
|
| @@ -78,7 +78,7 @@ NetworkQualitiesPrefsManager::NetworkQualitiesPrefsManager(
|
| NetworkQualitiesPrefsManager::~NetworkQualitiesPrefsManager() {
|
| if (!network_task_runner_)
|
| return;
|
| - DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
|
| if (network_quality_estimator_)
|
| network_quality_estimator_->RemoveNetworkQualitiesCacheObserver(this);
|
| }
|
| @@ -99,34 +99,34 @@ void NetworkQualitiesPrefsManager::InitializeOnNetworkThread(
|
| void NetworkQualitiesPrefsManager::OnChangeInCachedNetworkQuality(
|
| const nqe::internal::NetworkID& network_id,
|
| const nqe::internal::CachedNetworkQuality& cached_network_quality) {
|
| - DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
|
|
|
| // Notify |this| on the pref thread.
|
| pref_task_runner_->PostTask(
|
| FROM_HERE,
|
| base::Bind(&NetworkQualitiesPrefsManager::
|
| - OnChangeInCachedNetworkQualityOnPrefThread,
|
| + OnChangeInCachedNetworkQualityOnPrefSequence,
|
| pref_weak_ptr_, network_id, cached_network_quality));
|
| }
|
|
|
| -void NetworkQualitiesPrefsManager::ShutdownOnPrefThread() {
|
| - DCHECK(pref_task_runner_->RunsTasksOnCurrentThread());
|
| +void NetworkQualitiesPrefsManager::ShutdownOnPrefSequence() {
|
| + DCHECK(pref_task_runner_->RunsTasksInCurrentSequence());
|
| pref_weak_ptr_factory_.InvalidateWeakPtrs();
|
| pref_delegate_.reset();
|
| }
|
|
|
| void NetworkQualitiesPrefsManager::ClearPrefs() {
|
| - DCHECK(pref_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(pref_task_runner_->RunsTasksInCurrentSequence());
|
| prefs_->Clear();
|
| DCHECK_EQ(0u, prefs_->size());
|
| pref_delegate_->SetDictionaryValue(*prefs_);
|
| }
|
|
|
| -void NetworkQualitiesPrefsManager::OnChangeInCachedNetworkQualityOnPrefThread(
|
| +void NetworkQualitiesPrefsManager::OnChangeInCachedNetworkQualityOnPrefSequence(
|
| const nqe::internal::NetworkID& network_id,
|
| const nqe::internal::CachedNetworkQuality& cached_network_quality) {
|
| // The prefs can only be written on the pref thread.
|
| - DCHECK(pref_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(pref_task_runner_->RunsTasksInCurrentSequence());
|
| DCHECK_GE(kMaxCacheSize, prefs_->size());
|
|
|
| std::string network_id_string = network_id.ToString();
|
| @@ -170,7 +170,7 @@ void NetworkQualitiesPrefsManager::OnChangeInCachedNetworkQualityOnPrefThread(
|
| }
|
|
|
| ParsedPrefs NetworkQualitiesPrefsManager::ForceReadPrefsForTesting() const {
|
| - DCHECK(pref_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(pref_task_runner_->RunsTasksInCurrentSequence());
|
| std::unique_ptr<base::DictionaryValue> value(
|
| pref_delegate_->GetDictionaryValue());
|
| return ConvertDictionaryValueToMap(value.get());
|
|
|