| Index: chrome/browser/sync/glue/preference_data_type_controller.h
|
| diff --git a/chrome/browser/sync/glue/preference_data_type_controller.h b/chrome/browser/sync/glue/preference_data_type_controller.h
|
| index f126bdfa6b3ea06724aa9892831c28d84bb39e34..6f3d009ab685e69c1f25a2923d4dfc9dcfcffac9 100644
|
| --- a/chrome/browser/sync/glue/preference_data_type_controller.h
|
| +++ b/chrome/browser/sync/glue/preference_data_type_controller.h
|
| @@ -23,12 +23,9 @@ class PreferenceDataTypeController : public FrontendDataTypeController {
|
|
|
| // FrontendDataTypeController implementation.
|
| virtual syncable::ModelType type() const OVERRIDE;
|
| - virtual AssociatorInterface* model_associator() const OVERRIDE;
|
| - virtual void set_model_associator(AssociatorInterface* associator) OVERRIDE;
|
|
|
| private:
|
| // FrontendDataTypeController implementations.
|
| - // TODO(zea): Remove this once everything uses the NewAssociatorInterface.
|
| virtual void CreateSyncComponents() OVERRIDE;
|
| virtual void RecordUnrecoverableError(
|
| const tracked_objects::Location& from_here,
|
| @@ -36,11 +33,6 @@ class PreferenceDataTypeController : public FrontendDataTypeController {
|
| virtual void RecordAssociationTime(base::TimeDelta time) OVERRIDE;
|
| virtual void RecordStartFailure(StartResult result) OVERRIDE;
|
|
|
| - // Owned by pref service.
|
| - // TODO(zea): Make this a SyncableService once AssociatorInterface is
|
| - // deprecated.
|
| - AssociatorInterface* pref_sync_service_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(PreferenceDataTypeController);
|
| };
|
|
|
|
|