components/bookmarks/managed/managed_bookmarks_tracker.cc - Issue 1906973002: Convert //components/bookmarks 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/bookmarks/managed/managed_bookmarks_tracker.cc

Issue 1906973002: Convert //components/bookmarks 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/bookmarks/managed/managed_bookmarks_tracker.h ('k') | components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/bookmarks/managed/managed_bookmarks_tracker.cc

diff --git a/components/bookmarks/managed/managed_bookmarks_tracker.cc b/components/bookmarks/managed/managed_bookmarks_tracker.cc

index 1c1813392dff49f36ba49ce6a8e1cbe12ed67683..b72a3c5db943688d1b1fb99dc34a094f44e8e839 100644

--- a/components/bookmarks/managed/managed_bookmarks_tracker.cc

+++ b/components/bookmarks/managed/managed_bookmarks_tracker.cc

@@ -10,6 +10,7 @@

#include "base/bind_helpers.h"

#include "base/callback.h"

#include "base/logging.h"

+#include "base/memory/ptr_util.h"

#include "base/strings/utf_string_conversions.h"

#include "base/values.h"

#include "components/bookmarks/browser/bookmark_model.h"

@@ -41,10 +42,10 @@ ManagedBookmarksTracker::ManagedBookmarksTracker(

ManagedBookmarksTracker::~ManagedBookmarksTracker() {}

-scoped_ptr<base::ListValue>

+std::unique_ptr<base::ListValue>

ManagedBookmarksTracker::GetInitialManagedBookmarks() {

const base::ListValue* list = prefs_->GetList(GetPrefName());

- return make_scoped_ptr(list->DeepCopy());

+ return base::WrapUnique(list->DeepCopy());

}

// static