components/keyed_service/content/browser_context_keyed_service_factory.h - 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: components/keyed_service/content/browser_context_keyed_service_factory.h

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 | « components/feedback/feedback_uploader_unittest.cc ('k') | components/keyed_service/content/browser_context_keyed_service_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/keyed_service/content/browser_context_keyed_service_factory.h

diff --git a/components/keyed_service/content/browser_context_keyed_service_factory.h b/components/keyed_service/content/browser_context_keyed_service_factory.h

index 24c34673baa2c8f119fffff52b0798750c09ba7a..5543bbdc1791df80758554c925d505518312dd65 100644

--- a/components/keyed_service/content/browser_context_keyed_service_factory.h

+++ b/components/keyed_service/content/browser_context_keyed_service_factory.h

@@ -40,7 +40,7 @@ class KEYED_SERVICE_EXPORT BrowserContextKeyedServiceFactory

// A function that supplies the instance of a KeyedService for a given

// BrowserContext. This is used primarily for testing, where we want to feed

// a specific mock into the BCKSF system.

- typedef KeyedService* (*TestingFactoryFunction)(

+ typedef scoped_ptr<KeyedService>(*TestingFactoryFunction)(

content::BrowserContext* context);

@@ -130,7 +130,7 @@ class KEYED_SERVICE_EXPORT BrowserContextKeyedServiceFactory

user_prefs::PrefRegistrySyncable* registry) {}

// KeyedServiceFactory:

- KeyedService* BuildServiceInstanceFor(

+ scoped_ptr<KeyedService> BuildServiceInstanceFor(

base::SupportsUserData* context) const final;

bool IsOffTheRecord(base::SupportsUserData* context) const final;