chrome/browser/ui/app_list/app_list_syncable_service_factory.cc - Issue 1165913002: [Cleanup] Used scoped pointers in KeyedServiceFactory's SetTestingFactory functions.

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: chrome/browser/ui/app_list/app_list_syncable_service_factory.cc

Issue 1165913002: [Cleanup] Used scoped pointers in KeyedServiceFactory's SetTestingFactory functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Finish renaming profile -> context Created 5 years, 6 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 | « chrome/browser/ui/app_list/app_list_syncable_service_factory.h ('k') | chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/app_list/app_list_syncable_service_factory.cc

diff --git a/chrome/browser/ui/app_list/app_list_syncable_service_factory.cc b/chrome/browser/ui/app_list/app_list_syncable_service_factory.cc

index 3ef9d923ca6bddae213d09ba1007b5845567c89b..06e73ced0c0150fef475b12de916419ea9fdf335 100644

--- a/chrome/browser/ui/app_list/app_list_syncable_service_factory.cc

+++ b/chrome/browser/ui/app_list/app_list_syncable_service_factory.cc

@@ -35,7 +35,7 @@ AppListSyncableServiceFactory* AppListSyncableServiceFactory::GetInstance() {

}

// static

-KeyedService* AppListSyncableServiceFactory::BuildInstanceFor(

+scoped_ptr<KeyedService> AppListSyncableServiceFactory::BuildInstanceFor(

content::BrowserContext* browser_context) {

Profile* profile = static_cast<Profile*>(browser_context);

#if defined(OS_CHROMEOS)

@@ -44,8 +44,8 @@ KeyedService* AppListSyncableServiceFactory::BuildInstanceFor(

#endif

VLOG(1) << "BuildInstanceFor: " << profile->GetDebugName()

<< " (" << profile << ")";

- return new AppListSyncableService(profile,

- extensions::ExtensionSystem::Get(profile));

+ return make_scoped_ptr(new AppListSyncableService(

+ profile, extensions::ExtensionSystem::Get(profile)));

}

AppListSyncableServiceFactory::AppListSyncableServiceFactory()

@@ -70,7 +70,7 @@ AppListSyncableServiceFactory::~AppListSyncableServiceFactory() {

KeyedService* AppListSyncableServiceFactory::BuildServiceInstanceFor(

content::BrowserContext* browser_context) const {

- return BuildInstanceFor(static_cast<Profile*>(browser_context));

+ return BuildInstanceFor(static_cast<Profile*>(browser_context)).release();

}

void AppListSyncableServiceFactory::RegisterProfilePrefs(