components/sync_bookmarks/bookmark_change_processor.cc - Issue 1921923002: Convert //components/[o-t]* 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_bookmarks/bookmark_change_processor.cc

Issue 1921923002: Convert //components/[o-t]* 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

« no previous file with comments | « components/sync_bookmarks/bookmark_change_processor.h ('k') | components/sync_bookmarks/bookmark_data_type_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/sync_bookmarks/bookmark_change_processor.cc

diff --git a/components/sync_bookmarks/bookmark_change_processor.cc b/components/sync_bookmarks/bookmark_change_processor.cc

index 4645f70fac9fe244fe7afd315e8f6691a011aa42..385a19586bc46d18b025f8e55f5314eebb3235e6 100644

--- a/components/sync_bookmarks/bookmark_change_processor.cc

+++ b/components/sync_bookmarks/bookmark_change_processor.cc

@@ -871,12 +871,12 @@ bool BookmarkChangeProcessor::SetBookmarkFavicon(

}

// static

-scoped_ptr<BookmarkNode::MetaInfoMap>

+std::unique_ptr<BookmarkNode::MetaInfoMap>

BookmarkChangeProcessor::GetBookmarkMetaInfo(

const syncer::BaseNode* sync_node) {

const sync_pb::BookmarkSpecifics& specifics =

sync_node->GetBookmarkSpecifics();

- scoped_ptr<BookmarkNode::MetaInfoMap> meta_info_map(

+ std::unique_ptr<BookmarkNode::MetaInfoMap> meta_info_map(

new BookmarkNode::MetaInfoMap);

for (int i = 0; i < specifics.meta_info_size(); ++i) {

(*meta_info_map)[specifics.meta_info(i).key()] =