| Index: components/sync/model/model_type_service.h
|
| diff --git a/components/sync/model/model_type_service.h b/components/sync/model/model_type_service.h
|
| index 1476e7e47e56cbf2e1412bf1e8664294828f34a6..62b7f9fca6f689da08871e51f7acbe3d860ba6ce 100644
|
| --- a/components/sync/model/model_type_service.h
|
| +++ b/components/sync/model/model_type_service.h
|
| @@ -95,11 +95,6 @@ class ModelTypeService : public base::SupportsWeakPtr<ModelTypeService> {
|
| // should be.
|
| virtual std::string GetStorageKey(const EntityData& entity_data) = 0;
|
|
|
| - // Overridable notification for when the processor is set. This is typically
|
| - // when the service should start loading metadata and then subsequently giving
|
| - // it to the processor.
|
| - virtual void OnChangeProcessorSet() = 0;
|
| -
|
| // Resolve a conflict between the client and server versions of data. They are
|
| // guaranteed not to match (both be deleted or have identical specifics). A
|
| // default implementation chooses the server data unless it is a deletion.
|
| @@ -121,17 +116,12 @@ class ModelTypeService : public base::SupportsWeakPtr<ModelTypeService> {
|
|
|
| ModelTypeChangeProcessor* change_processor() const;
|
|
|
| - protected:
|
| - void CreateChangeProcessor();
|
| -
|
| - void clear_change_processor();
|
| -
|
| private:
|
| - std::unique_ptr<ModelTypeChangeProcessor> change_processor_;
|
| + const ModelType type_;
|
|
|
| - ChangeProcessorFactory change_processor_factory_;
|
| + const ChangeProcessorFactory change_processor_factory_;
|
|
|
| - const ModelType type_;
|
| + std::unique_ptr<ModelTypeChangeProcessor> change_processor_;
|
| };
|
|
|
| } // namespace syncer
|
|
|