Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(303)

Unified Diff: sync/internal_api/sync_context_proxy_impl.h

Issue 1866243002: Convert //sync from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sync/internal_api/sync_context_proxy_impl.h
diff --git a/sync/internal_api/sync_context_proxy_impl.h b/sync/internal_api/sync_context_proxy_impl.h
index bde38e4a5edab2376ce35efd635d96488ed40d87..243cc3894d69bdb25e35f7caee686713626e2eba 100644
--- a/sync/internal_api/sync_context_proxy_impl.h
+++ b/sync/internal_api/sync_context_proxy_impl.h
@@ -5,7 +5,8 @@
#ifndef SYNC_INTERNAL_API_SYNC_CONTEXT_PROXY_IMPL_H_
#define SYNC_INTERNAL_API_SYNC_CONTEXT_PROXY_IMPL_H_
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
#include "base/memory/weak_ptr.h"
#include "base/sequenced_task_runner.h"
#include "sync/base/sync_export.h"
@@ -34,12 +35,12 @@ class SYNC_EXPORT SyncContextProxyImpl : public SyncContextProxy {
// unable to distinguish a slow success from failure.
void ConnectTypeToSync(
syncer::ModelType type,
- scoped_ptr<ActivationContext> activation_context) override;
+ std::unique_ptr<ActivationContext> activation_context) override;
// Disables syncing for the given type on the sync thread.
void Disconnect(syncer::ModelType type) override;
- scoped_ptr<SyncContextProxy> Clone() const override;
+ std::unique_ptr<SyncContextProxy> Clone() const override;
private:
// A SequencedTaskRunner representing the thread where the SyncContext lives.

Powered by Google App Engine
This is Rietveld 408576698