components/dom_distiller/core/distilled_content_store.cc - Issue 1879613003: Convert //components/dom_distiller 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/dom_distiller/core/distilled_content_store.cc

Issue 1879613003: Convert //components/dom_distiller from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase 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/dom_distiller/core/distilled_content_store.h ('k') | components/dom_distiller/core/distilled_content_store_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/dom_distiller/core/distilled_content_store.cc

diff --git a/components/dom_distiller/core/distilled_content_store.cc b/components/dom_distiller/core/distilled_content_store.cc

index e6885cbd10e142fc62674d24dacbcd67fda734a7..05dc7c3a385175a8e85987a1d87c353e2cf6383f 100644

--- a/components/dom_distiller/core/distilled_content_store.cc

+++ b/components/dom_distiller/core/distilled_content_store.cc

@@ -49,7 +49,7 @@ void InMemoryContentStore::LoadContent(

}

- scoped_ptr<DistilledArticleProto> distilled_article;

+ std::unique_ptr<DistilledArticleProto> distilled_article;

if (success) {

distilled_article.reset(new DistilledArticleProto(*it->second));

} else {

@@ -63,7 +63,7 @@ void InMemoryContentStore::LoadContent(

void InMemoryContentStore::InjectContent(const ArticleEntry& entry,

const DistilledArticleProto& proto) {

cache_.Put(entry.entry_id(),

- scoped_ptr<DistilledArticleProto, CacheDeletor>(

+ std::unique_ptr<DistilledArticleProto, CacheDeletor>(

new DistilledArticleProto(proto), CacheDeletor(this)));

AddUrlToIdMapping(entry, proto);

}