components/sync_driver/shared_change_processor.cc - Issue 1907683003: Convert //components/sync_driver from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/sync_driver/shared_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: Build fix, address feedback 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 | « components/sync_driver/profile_sync_auth_provider_unittest.cc ('k') | components/sync_driver/shared_change_processor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/sync_driver/shared_change_processor.cc

diff --git a/components/sync_driver/shared_change_processor.cc b/components/sync_driver/shared_change_processor.cc

index 1854e200b04ccb8d1e6df04b83b828c5ba53624f..9bdd3a27aca68c3be88b7e820b89c5dd749d6880 100644

--- a/components/sync_driver/shared_change_processor.cc

+++ b/components/sync_driver/shared_change_processor.cc

@@ -81,7 +81,7 @@ base::WeakPtr<syncer::SyncableService> SharedChangeProcessor::Connect(

merge_result,

sync_client).release();

// If available, propagate attachment service to the syncable service.

- scoped_ptr<syncer::AttachmentService> attachment_service =

+ std::unique_ptr<syncer::AttachmentService> attachment_service =

generic_change_processor_->GetAttachmentService();

if (attachment_service) {

local_service->SetAttachmentService(std::move(attachment_service));