chrome/browser/prefs/chrome_pref_service_factory.h - Issue 64193003: Clean up PrefServiceBuilder

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/prefs/chrome_pref_service_factory.h

Issue 64193003: Clean up PrefServiceBuilder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix memory ownership bug in ProxyPolicyTest Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/prefs/chrome_pref_service_factory.h

diff --git a/chrome/browser/prefs/chrome_pref_service_factory.h b/chrome/browser/prefs/chrome_pref_service_factory.h

index eb6b4fce2cc0a80a2f0b4e0dcc4a399e877135d6..b1322b768e29e33a7bb6bd5defc7ac2298b30907 100644

--- a/chrome/browser/prefs/chrome_pref_service_factory.h

+++ b/chrome/browser/prefs/chrome_pref_service_factory.h

@@ -6,6 +6,7 @@

#define CHROME_BROWSER_PREFS_CHROME_PREF_SERVICE_FACTORY_H_

#include "base/memory/ref_counted.h"

+#include "base/memory/scoped_ptr.h"

namespace base {

class FilePath;

@@ -43,14 +44,14 @@ namespace chrome_prefs {

// guaranteed that in asynchronous version initialization happens after this

// function returned.

-PrefService* CreateLocalState(

+scoped_ptr<PrefService> CreateLocalState(

const base::FilePath& pref_filename,

base::SequencedTaskRunner* pref_io_task_runner,

policy::PolicyService* policy_service,

const scoped_refptr<PrefRegistry>& pref_registry,

bool async);

-PrefServiceSyncable* CreateProfilePrefs(

+scoped_ptr<PrefServiceSyncable> CreateProfilePrefs(

const base::FilePath& pref_filename,

base::SequencedTaskRunner* pref_io_task_runner,

policy::PolicyService* policy_service,