components/history/core/browser/top_sites_impl.cc - Issue 1129083003: More base::Values-related bare pointer -> scoped_ptr conversions

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/history/core/browser/top_sites_impl.cc

Issue 1129083003: More base::Values-related bare pointer -> scoped_ptr conversions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix bad merge Created 5 years, 7 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/dom_distiller/ios/distiller_page_ios.mm ('k') | components/json_schema/json_schema_validator_unittest_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/history/core/browser/top_sites_impl.cc

diff --git a/components/history/core/browser/top_sites_impl.cc b/components/history/core/browser/top_sites_impl.cc

index 4df526b6d3bb08c506f6221bba7c9c609cb06862..05548ddb6e422c373a1f6831231186d3f9bc784c 100644

--- a/components/history/core/browser/top_sites_impl.cc

+++ b/components/history/core/browser/top_sites_impl.cc

@@ -318,11 +318,11 @@ bool TopSitesImpl::HasBlacklistedItems() const {

void TopSitesImpl::AddBlacklistedURL(const GURL& url) {

DCHECK(thread_checker_.CalledOnValidThread());

- base::Value* dummy = base::Value::CreateNullValue();

+ scoped_ptr<base::Value> dummy = base::Value::CreateNullValue();

{

DictionaryPrefUpdate update(pref_service_, blacklist_pref_name_);

base::DictionaryValue* blacklist = update.Get();

- blacklist->SetWithoutPathExpansion(GetURLHash(url), dummy);

+ blacklist->SetWithoutPathExpansion(GetURLHash(url), dummy.Pass());

}

ResetThreadSafeCache();