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

Unified Diff: sync/internal_api/sync_manager_impl.cc

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_manager_impl.cc
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
index fae84466498012087df7c5438e5e57f450196352..335772160d134ed0051f6e85d3f9a0581690fe91 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -260,7 +260,7 @@ void SyncManagerImpl::Init(InitArgs* args) {
base::FilePath absolute_db_path = database_path_;
DCHECK(absolute_db_path.IsAbsolute());
- scoped_ptr<syncable::DirectoryBackingStore> backing_store =
+ std::unique_ptr<syncable::DirectoryBackingStore> backing_store =
args->internal_components_factory->BuildDirectoryBackingStore(
InternalComponentsFactory::STORAGE_ON_DISK,
args->credentials.account_id, absolute_db_path);
@@ -734,7 +734,7 @@ void SyncManagerImpl::SetExtraChangeRecordData(
sync_pb::EntitySpecifics original_specifics(original.ref(SPECIFICS));
if (type == PASSWORDS) {
// Passwords must use their own legacy ExtraPasswordChangeRecordData.
- scoped_ptr<sync_pb::PasswordSpecificsData> data(
+ std::unique_ptr<sync_pb::PasswordSpecificsData> data(
DecryptPasswordSpecifics(original_specifics, cryptographer));
if (!data) {
NOTREACHED();
@@ -880,7 +880,7 @@ void SyncManagerImpl::SetJsEventHandler(
js_sync_encryption_handler_observer_.SetJsEventHandler(event_handler);
}
-scoped_ptr<base::ListValue> SyncManagerImpl::GetAllNodesForType(
+std::unique_ptr<base::ListValue> SyncManagerImpl::GetAllNodesForType(
syncer::ModelType type) {
DirectoryTypeDebugInfoEmitterMap* emitter_map =
model_type_registry_->directory_type_debug_info_emitter_map();
@@ -891,7 +891,7 @@ scoped_ptr<base::ListValue> SyncManagerImpl::GetAllNodesForType(
// when it doesn't really know which types are enabled or disabled.
DLOG(WARNING) << "Asked to return debug info for invalid type "
<< ModelTypeToString(type);
- return scoped_ptr<base::ListValue>(new base::ListValue());
+ return std::unique_ptr<base::ListValue>(new base::ListValue());
}
return it->second->GetAllNodes();
@@ -907,7 +907,7 @@ void SyncManagerImpl::SetInvalidatorEnabled(bool invalidator_enabled) {
void SyncManagerImpl::OnIncomingInvalidation(
syncer::ModelType type,
- scoped_ptr<InvalidationInterface> invalidation) {
+ std::unique_ptr<InvalidationInterface> invalidation) {
DCHECK(thread_checker_.CalledOnValidThread());
allstatus_.IncrementNotificationsReceived();

Powered by Google App Engine
This is Rietveld 408576698