| Index: chrome/browser/prefs/pref_model_associator.cc
|
| diff --git a/chrome/browser/prefs/pref_model_associator.cc b/chrome/browser/prefs/pref_model_associator.cc
|
| index 40f2dff3f32a2bc8e5253c9b6ced5c70682b51df..2d95db36c5204fcebf75d9fe062e7960e3a99abb 100644
|
| --- a/chrome/browser/prefs/pref_model_associator.cc
|
| +++ b/chrome/browser/prefs/pref_model_associator.cc
|
| @@ -23,14 +23,6 @@ PrefModelAssociator::PrefModelAssociator()
|
| processing_syncer_changes_(false),
|
| pref_service_(NULL),
|
| sync_processor_(NULL) {
|
| -}
|
| -
|
| -PrefModelAssociator::PrefModelAssociator(
|
| - PrefService* pref_service)
|
| - : models_associated_(false),
|
| - processing_syncer_changes_(false),
|
| - pref_service_(pref_service),
|
| - sync_processor_(NULL) {
|
| DCHECK(CalledOnValidThread());
|
| }
|
|
|
| @@ -113,6 +105,11 @@ void PrefModelAssociator::InitPrefAndAssociate(
|
| return;
|
| }
|
|
|
| +void PrefModelAssociator::SetPrefService(PrefService* pref_service) {
|
| + DCHECK(pref_service_ == NULL);
|
| + pref_service = pref_service_;
|
| +}
|
| +
|
| SyncError PrefModelAssociator::MergeDataAndStartSyncing(
|
| syncable::ModelType type,
|
| const SyncDataList& initial_sync_data,
|
|
|