Index: sync/internal_api/public/engine/model_safe_worker.h |
diff --git a/sync/internal_api/public/engine/model_safe_worker.h b/sync/internal_api/public/engine/model_safe_worker.h |
index bc3f6e057cc87021a1aed275fc5214f112eb4a40..1e016a4881be9a875accdd5b8861c564e3d3669c 100644 |
--- a/sync/internal_api/public/engine/model_safe_worker.h |
+++ b/sync/internal_api/public/engine/model_safe_worker.h |
@@ -6,12 +6,12 @@ |
#define SYNC_INTERNAL_API_PUBLIC_ENGINE_MODEL_SAFE_WORKER_H_ |
#include <map> |
+#include <memory> |
#include <string> |
#include <vector> |
#include "base/callback.h" |
#include "base/memory/ref_counted.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/message_loop/message_loop.h" |
#include "base/synchronization/lock.h" |
#include "base/synchronization/waitable_event.h" |
@@ -152,7 +152,7 @@ class SYNC_EXPORT ModelSafeWorker |
typedef std::map<ModelType, ModelSafeGroup> ModelSafeRoutingInfo; |
// Caller takes ownership of return value. |
-SYNC_EXPORT scoped_ptr<base::DictionaryValue> ModelSafeRoutingInfoToValue( |
+SYNC_EXPORT std::unique_ptr<base::DictionaryValue> ModelSafeRoutingInfoToValue( |
const ModelSafeRoutingInfo& routing_info); |
SYNC_EXPORT std::string ModelSafeRoutingInfoToString( |