| Index: sync/internal_api/sync_context_proxy_impl.cc
|
| diff --git a/sync/internal_api/sync_context_proxy_impl.cc b/sync/internal_api/sync_context_proxy_impl.cc
|
| index 0f1fd221917037cc33ac58fa4fbace510200956e..27e63577ab0933742a106c5f3fa6e123fd42f08a 100644
|
| --- a/sync/internal_api/sync_context_proxy_impl.cc
|
| +++ b/sync/internal_api/sync_context_proxy_impl.cc
|
| @@ -23,7 +23,7 @@ SyncContextProxyImpl::~SyncContextProxyImpl() {
|
|
|
| void SyncContextProxyImpl::ConnectTypeToSync(
|
| syncer::ModelType type,
|
| - scoped_ptr<ActivationContext> activation_context) {
|
| + std::unique_ptr<ActivationContext> activation_context) {
|
| VLOG(1) << "ConnectTypeToSync: " << ModelTypeToString(type);
|
| sync_task_runner_->PostTask(
|
| FROM_HERE,
|
| @@ -37,8 +37,8 @@ void SyncContextProxyImpl::Disconnect(syncer::ModelType type) {
|
| base::Bind(&SyncContext::DisconnectSyncWorker, sync_context_, type));
|
| }
|
|
|
| -scoped_ptr<SyncContextProxy> SyncContextProxyImpl::Clone() const {
|
| - return scoped_ptr<SyncContextProxy>(
|
| +std::unique_ptr<SyncContextProxy> SyncContextProxyImpl::Clone() const {
|
| + return std::unique_ptr<SyncContextProxy>(
|
| new SyncContextProxyImpl(sync_task_runner_, sync_context_));
|
| }
|
|
|
|
|