| 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 5285b92419472db8153398bd3c7a5e3d211c3c44..0e52b99b8a895bdc24254db6d0c9e5e7e559da58 100644
|
| --- a/chrome/browser/sync/glue/preference_data_type_controller.cc
|
| +++ b/chrome/browser/sync/glue/preference_data_type_controller.cc
|
| @@ -5,11 +5,10 @@
|
| #include "chrome/browser/sync/glue/preference_data_type_controller.h"
|
|
|
| #include "base/metrics/histogram.h"
|
| -#include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| +#include "chrome/browser/sync/api/syncable_service.h"
|
| #include "chrome/browser/sync/glue/generic_change_processor.h"
|
| #include "chrome/browser/sync/profile_sync_factory.h"
|
| -#include "chrome/browser/sync/syncable_service.h"
|
|
|
| namespace browser_sync {
|
|
|
| @@ -19,12 +18,10 @@ PreferenceDataTypeController::PreferenceDataTypeController(
|
| ProfileSyncService* sync_service)
|
| : FrontendDataTypeController(profile_sync_factory,
|
| profile,
|
| - sync_service),
|
| - pref_sync_service_(NULL) {
|
| + sync_service) {
|
| }
|
|
|
| PreferenceDataTypeController::~PreferenceDataTypeController() {
|
| - pref_sync_service_ = NULL;
|
| }
|
|
|
| syncable::ModelType PreferenceDataTypeController::type() const {
|
| @@ -37,18 +34,6 @@ void PreferenceDataTypeController::CreateSyncComponents() {
|
| this);
|
| set_model_associator(sync_components.model_associator);
|
| set_change_processor(sync_components.change_processor);
|
| - reinterpret_cast<SyncableService*>(model_associator())->
|
| - SetupSync(sync_service_,
|
| - reinterpret_cast<GenericChangeProcessor*>(change_processor()));
|
| -}
|
| -
|
| -AssociatorInterface* PreferenceDataTypeController::model_associator() const {
|
| - return pref_sync_service_;
|
| -}
|
| -
|
| -void PreferenceDataTypeController::set_model_associator(
|
| - AssociatorInterface* associator) {
|
| - pref_sync_service_ = associator;
|
| }
|
|
|
| void PreferenceDataTypeController::RecordUnrecoverableError(
|
|
|