components/dom_distiller/standalone/content_extractor.cc - Issue 655143002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>.

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/standalone/content_extractor.cc

Issue 655143002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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/dom_distiller_store_unittest.cc ('k') | components/gcm_driver/gcm_account_mapper_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/dom_distiller/standalone/content_extractor.cc

diff --git a/components/dom_distiller/standalone/content_extractor.cc b/components/dom_distiller/standalone/content_extractor.cc

index f6e3278b5ccbb6652ad4eb0638d690e40496b9c2..150fd3196dc28134aeaa34ca76fa58ba655ee22b 100644

--- a/components/dom_distiller/standalone/content_extractor.cc

+++ b/components/dom_distiller/standalone/content_extractor.cc

@@ -76,8 +76,8 @@ scoped_ptr<DomDistillerService> CreateDomDistillerService(

scoped_ptr<leveldb_proto::ProtoDatabaseImpl<ArticleEntry> > db(

new leveldb_proto::ProtoDatabaseImpl<ArticleEntry>(

background_task_runner));

- scoped_ptr<DomDistillerStore> dom_distiller_store(new DomDistillerStore(

- db.PassAs<leveldb_proto::ProtoDatabase<ArticleEntry> >(), db_path));

+ scoped_ptr<DomDistillerStore> dom_distiller_store(

+ new DomDistillerStore(db.Pass(), db_path));

scoped_ptr<DistillerPageFactory> distiller_page_factory(

new DistillerPageWebContentsFactory(context));

@@ -105,11 +105,10 @@ scoped_ptr<DomDistillerService> CreateDomDistillerService(

DistilledPagePrefs::RegisterProfilePrefs(pref_service->registry());

return scoped_ptr<DomDistillerService>(new DomDistillerService(

- dom_distiller_store.PassAs<DomDistillerStoreInterface>(),

+ dom_distiller_store.Pass(),

distiller_factory.Pass(),

distiller_page_factory.Pass(),

- scoped_ptr<DistilledPagePrefs>(

- new DistilledPagePrefs(pref_service))));

+ scoped_ptr<DistilledPagePrefs>(new DistilledPagePrefs(pref_service))));

}

void AddComponentsResources() {