| Index: sync/internal_api/public/sync_context_proxy.h
|
| diff --git a/sync/internal_api/public/sync_context_proxy.h b/sync/internal_api/public/sync_context_proxy.h
|
| index f2eff7e13cd9af5a206d18ca767de2713ae203ce..e84241f4b9256011d5725b9c072c183d2e9a7d78 100644
|
| --- a/sync/internal_api/public/sync_context_proxy.h
|
| +++ b/sync/internal_api/public/sync_context_proxy.h
|
| @@ -5,7 +5,8 @@
|
| #ifndef SYNC_INTERNAL_API_PUBLIC_SYNC_CONTEXT_PROXY_H_
|
| #define SYNC_INTERNAL_API_PUBLIC_SYNC_CONTEXT_PROXY_H_
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "sync/internal_api/public/base/model_type.h"
|
|
|
| namespace syncer_v2 {
|
| @@ -22,7 +23,7 @@ class SYNC_EXPORT SyncContextProxy {
|
| // Attempts to connect a non-blocking type to the sync context.
|
| virtual void ConnectTypeToSync(
|
| syncer::ModelType type,
|
| - scoped_ptr<ActivationContext> activation_context) = 0;
|
| + std::unique_ptr<ActivationContext> activation_context) = 0;
|
|
|
| // Tells the syncer that we're no longer interested in syncing this type.
|
| //
|
| @@ -32,7 +33,7 @@ class SYNC_EXPORT SyncContextProxy {
|
| virtual void Disconnect(syncer::ModelType type) = 0;
|
|
|
| // Creates a clone of this SyncContextProxy.
|
| - virtual scoped_ptr<SyncContextProxy> Clone() const = 0;
|
| + virtual std::unique_ptr<SyncContextProxy> Clone() const = 0;
|
| };
|
|
|
| } // namespace syncer_v2
|
|
|