Index: sync/sessions/model_type_registry.h |
diff --git a/sync/sessions/model_type_registry.h b/sync/sessions/model_type_registry.h |
index 576535a894d773304b8240dab21af0270fea292d..722164c9415709e919ab2cd43e2d7244b206a571 100644 |
--- a/sync/sessions/model_type_registry.h |
+++ b/sync/sessions/model_type_registry.h |
@@ -6,11 +6,11 @@ |
#define SYNC_SESSIONS_MODEL_TYPE_REGISTRY_H_ |
#include <map> |
+#include <memory> |
#include <string> |
#include <vector> |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/scoped_vector.h" |
#include "base/memory/weak_ptr.h" |
#include "sync/base/sync_export.h" |
@@ -62,9 +62,9 @@ class SYNC_EXPORT ModelTypeRegistry : public syncer_v2::SyncContext, |
// and its task_runner to the newly created worker. |
// |
// Expects that the proxy's ModelType is not currently enabled. |
- void ConnectSyncTypeToWorker( |
- syncer::ModelType type, |
- scoped_ptr<syncer_v2::ActivationContext> activation_context) override; |
+ void ConnectSyncTypeToWorker(syncer::ModelType type, |
+ std::unique_ptr<syncer_v2::ActivationContext> |
+ activation_context) override; |
// Disables the syncing of an off-thread type. |
// |
@@ -137,7 +137,7 @@ class SYNC_EXPORT ModelTypeRegistry : public syncer_v2::SyncContext, |
syncable::Directory* directory_; |
// A copy of the directory's most recent cryptographer. |
- scoped_ptr<Cryptographer> cryptographer_; |
+ std::unique_ptr<Cryptographer> cryptographer_; |
// The set of encrypted types. |
ModelTypeSet encrypted_types_; |