| Index: sync/api/model_type_change_processor.h
|
| diff --git a/sync/api/model_type_change_processor.h b/sync/api/model_type_change_processor.h
|
| index 91f7380aa547412a5dc0f287952aec2067355656..16ca825802845e6bd8d9f4ea80088123fec5f709 100644
|
| --- a/sync/api/model_type_change_processor.h
|
| +++ b/sync/api/model_type_change_processor.h
|
| @@ -5,9 +5,9 @@
|
| #ifndef SYNC_API_MODEL_TYPE_CHANGE_PROCESSOR_H_
|
| #define SYNC_API_MODEL_TYPE_CHANGE_PROCESSOR_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "sync/api/entity_data.h"
|
| #include "sync/base/sync_export.h"
|
| #include "sync/internal_api/public/activation_context.h"
|
| @@ -25,7 +25,8 @@ class MetadataChangeList;
|
| // changes.
|
| class SYNC_EXPORT ModelTypeChangeProcessor {
|
| public:
|
| - typedef base::Callback<void(syncer::SyncError, scoped_ptr<ActivationContext>)>
|
| + typedef base::Callback<void(syncer::SyncError,
|
| + std::unique_ptr<ActivationContext>)>
|
| StartCallback;
|
|
|
| ModelTypeChangeProcessor();
|
| @@ -36,7 +37,7 @@ class SYNC_EXPORT ModelTypeChangeProcessor {
|
| // non-unique name. The processor will fill in the rest if the service does
|
| // not have a reason to care.
|
| virtual void Put(const std::string& client_tag,
|
| - scoped_ptr<EntityData> entity_data,
|
| + std::unique_ptr<EntityData> entity_data,
|
| MetadataChangeList* metadata_change_list) = 0;
|
|
|
| // Inform the processor of a deleted entity.
|
| @@ -45,7 +46,7 @@ class SYNC_EXPORT ModelTypeChangeProcessor {
|
|
|
| // Accept the initial sync metadata loaded by the service. This should be
|
| // called as soon as the metadata is available to the service.
|
| - virtual void OnMetadataLoaded(scoped_ptr<MetadataBatch> batch) = 0;
|
| + virtual void OnMetadataLoaded(std::unique_ptr<MetadataBatch> batch) = 0;
|
|
|
| // Called by the DataTypeController to gather additional information needed
|
| // before a CommitQueue object can be created for this model type. Once the
|
|
|