Index: sync/internal_api/test/null_sync_context_proxy.cc |
diff --git a/sync/internal_api/test/null_sync_context_proxy.cc b/sync/internal_api/test/null_sync_context_proxy.cc |
index 3695b1cfdb034235b4e79486a650850990387c66..8bed16b2e44c1a740e26832f46b9213d41e42a98 100644 |
--- a/sync/internal_api/test/null_sync_context_proxy.cc |
+++ b/sync/internal_api/test/null_sync_context_proxy.cc |
@@ -16,7 +16,7 @@ NullSyncContextProxy::~NullSyncContextProxy() { |
void NullSyncContextProxy::ConnectTypeToSync( |
syncer::ModelType type, |
- scoped_ptr<ActivationContext> activation_context) { |
+ std::unique_ptr<ActivationContext> activation_context) { |
NOTREACHED() << "NullSyncContextProxy is not meant to be used"; |
} |
@@ -24,8 +24,8 @@ void NullSyncContextProxy::Disconnect(syncer::ModelType type) { |
NOTREACHED() << "NullSyncContextProxy is not meant to be used"; |
} |
-scoped_ptr<SyncContextProxy> NullSyncContextProxy::Clone() const { |
- return scoped_ptr<SyncContextProxy>(new NullSyncContextProxy()); |
+std::unique_ptr<SyncContextProxy> NullSyncContextProxy::Clone() const { |
+ return std::unique_ptr<SyncContextProxy>(new NullSyncContextProxy()); |
} |
} // namespace syncer_v2 |