Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6116)

Unified Diff: chrome/browser/sync/glue/preference_data_type_controller.cc

Issue 6905044: Refactor preference syncing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix the previous fix Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/glue/preference_data_type_controller.cc
diff --git a/chrome/browser/sync/glue/preference_data_type_controller.cc b/chrome/browser/sync/glue/preference_data_type_controller.cc
index 3331bd34089ed760088e0c4e7d670cbd37426ae3..ecbd5f93c5c5fe14f232b1f06aab45ce7d6094bf 100644
--- a/chrome/browser/sync/glue/preference_data_type_controller.cc
+++ b/chrome/browser/sync/glue/preference_data_type_controller.cc
@@ -25,10 +25,7 @@ syncable::ModelType PreferenceDataTypeController::type() const {
}
void PreferenceDataTypeController::CreateSyncComponents() {
- ProfileSyncFactory::SyncComponents sync_components = profile_sync_factory_->
- CreatePreferenceSyncComponents(sync_service_, this);
- model_associator_.reset(sync_components.model_associator);
- change_processor_.reset(sync_components.change_processor);
+ change_processor_.reset(model_associator_->change_processor());
}
void PreferenceDataTypeController::RecordUnrecoverableError(

Powered by Google App Engine
This is Rietveld 408576698