Chromium Code Reviews| Index: components/sync/api/model_type_service.h |
| diff --git a/components/sync/api/model_type_service.h b/components/sync/api/model_type_service.h |
| index c4a8779a0c0cc308fc935bf795757dc59166a9c0..e992e65f11f67af54adf101dbb29e6955ffebcc1 100644 |
| --- a/components/sync/api/model_type_service.h |
| +++ b/components/sync/api/model_type_service.h |
| @@ -12,16 +12,13 @@ |
| #include "base/callback.h" |
| #include "base/memory/weak_ptr.h" |
| #include "components/sync/api/conflict_resolution.h" |
| +#include "components/sync/api/data_type_error_handler.h" |
| #include "components/sync/api/entity_change.h" |
| #include "components/sync/api/entity_data.h" |
| #include "components/sync/api/model_type_change_processor.h" |
| #include "components/sync/api/sync_error.h" |
| #include "components/sync/core/activation_context.h" |
| -namespace syncer { |
| -class DataTypeErrorHandler; |
|
skym
2016/09/02 22:45:28
Was this necessary? Shouldn't forward declaring be
maxbogue
2016/09/03 00:14:51
No, unique_ptr requires the actual class definitio
|
| -} // namespace syncer |
| - |
| namespace syncer_v2 { |
| class DataBatch; |
| @@ -113,8 +110,9 @@ class ModelTypeService : public base::SupportsWeakPtr<ModelTypeService> { |
| // Called by the DataTypeController to gather additional information needed |
| // before the processor can be connected to a sync worker. Once the |
| // metadata has been loaded, the info is collected and given to |callback|. |
| - void OnSyncStarting(syncer::DataTypeErrorHandler* error_handler, |
| - const ModelTypeChangeProcessor::StartCallback& callback); |
| + void OnSyncStarting( |
| + std::unique_ptr<syncer::DataTypeErrorHandler> error_handler, |
| + const ModelTypeChangeProcessor::StartCallback& callback); |
| // Indicates that we no longer want to do any sync-related things for this |
| // data type. Severs all ties to the sync thread, deletes all local sync |