| Index: components/sync_preferences/pref_model_associator.cc
|
| diff --git a/components/sync_preferences/pref_model_associator.cc b/components/sync_preferences/pref_model_associator.cc
|
| index 49bd331ffe63009ad4efe09845429fc975c4002f..3175208aa1b9e20a67bba5bfb98c581909dfb570 100644
|
| --- a/components/sync_preferences/pref_model_associator.cc
|
| +++ b/components/sync_preferences/pref_model_associator.cc
|
| @@ -63,12 +63,12 @@ PrefModelAssociator::PrefModelAssociator(
|
| pref_service_(NULL),
|
| type_(type),
|
| client_(client) {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| DCHECK(type_ == PREFERENCES || type_ == PRIORITY_PREFERENCES);
|
| }
|
|
|
| PrefModelAssociator::~PrefModelAssociator() {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| pref_service_ = NULL;
|
|
|
| synced_pref_observers_.clear();
|
| @@ -166,7 +166,7 @@ syncer::SyncMergeResult PrefModelAssociator::MergeDataAndStartSyncing(
|
| std::unique_ptr<syncer::SyncChangeProcessor> sync_processor,
|
| std::unique_ptr<syncer::SyncErrorFactory> sync_error_factory) {
|
| DCHECK_EQ(type_, type);
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| DCHECK(pref_service_);
|
| DCHECK(!sync_processor_.get());
|
| DCHECK(sync_processor.get());
|
|
|