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

Unified Diff: components/sync_driver/generic_change_processor.cc

Issue 1907683003: Convert //components/sync_driver 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: components/sync_driver/generic_change_processor.cc
diff --git a/components/sync_driver/generic_change_processor.cc b/components/sync_driver/generic_change_processor.cc
index 2df982022d69edcf38f818ec0f6d81ac73548e6b..6c13e17abbbd83f2917964f2354d2b097668fa43 100644
--- a/components/sync_driver/generic_change_processor.cc
+++ b/components/sync_driver/generic_change_processor.cc
@@ -101,7 +101,7 @@ GenericChangeProcessor::GenericChangeProcessor(
const base::WeakPtr<syncer::SyncMergeResult>& merge_result,
syncer::UserShare* user_share,
SyncClient* sync_client,
- scoped_ptr<syncer::AttachmentStoreForSync> attachment_store)
+ std::unique_ptr<syncer::AttachmentStoreForSync> attachment_store)
: ChangeProcessor(error_handler),
type_(type),
local_service_(local_service),
@@ -147,7 +147,7 @@ void GenericChangeProcessor::ApplyChangesFromSyncModel(
for (syncer::ChangeRecordList::const_iterator it =
changes.Get().begin(); it != changes.Get().end(); ++it) {
if (it->action == syncer::ChangeRecord::ACTION_DELETE) {
- scoped_ptr<sync_pb::EntitySpecifics> specifics;
+ std::unique_ptr<sync_pb::EntitySpecifics> specifics;
if (it->specifics.has_password()) {
DCHECK(it->extra.get());
specifics.reset(new sync_pb::EntitySpecifics(it->specifics));
@@ -712,9 +712,9 @@ void GenericChangeProcessor::UploadAllAttachmentsNotOnServer() {
}
}
-scoped_ptr<syncer::AttachmentService>
+std::unique_ptr<syncer::AttachmentService>
GenericChangeProcessor::GetAttachmentService() const {
- return scoped_ptr<syncer::AttachmentService>(
+ return std::unique_ptr<syncer::AttachmentService>(
new syncer::AttachmentServiceProxy(attachment_service_proxy_));
}

Powered by Google App Engine
This is Rietveld 408576698