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

Unified Diff: sync/sessions/model_type_registry.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: Rebase and fix conflicts 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
« no previous file with comments | « sync/sessions/directory_type_debug_info_emitter.cc ('k') | sync/sessions/model_type_registry.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/sessions/model_type_registry.h
diff --git a/sync/sessions/model_type_registry.h b/sync/sessions/model_type_registry.h
index 3e38fa3f288ebd899a10ecb2efd35fc0914e3448..744f4e86c2e6c9f877008bc701df71f92d3608f2 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 ConnectType(
- syncer::ModelType type,
- scoped_ptr<syncer_v2::ActivationContext> activation_context) override;
+ void ConnectType(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_;
« no previous file with comments | « sync/sessions/directory_type_debug_info_emitter.cc ('k') | sync/sessions/model_type_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698