chrome/browser/prefs/pref_service_mock_builder.h - Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

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/pref_service_mock_builder.h

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again; base::File changes conflicted. Created 7 years, 10 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:

Index: chrome/browser/prefs/pref_service_mock_builder.h

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

index 6105e49678242347b63cd23911b635e26bc4655d..2a237a3a4ba8654e291abd5cb9504a6bb5db3db3 100644

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

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

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

#include "chrome/browser/prefs/pref_service_syncable_builder.h"

class PrefService;

+class PrefRegistrySyncable;

class PrefServiceSyncable;

// A helper that allows convenient building of custom PrefServices in tests.

@@ -19,7 +20,8 @@ class PrefServiceMockBuilder : public PrefServiceSyncableBuilder {

// Creates a PrefService for testing, invalidating the entire

// builder configuration.

virtual PrefService* Create(PrefRegistry* pref_registry) OVERRIDE;

- virtual PrefServiceSyncable* CreateSyncable() OVERRIDE;

+ virtual PrefServiceSyncable* CreateSyncable(

+ PrefRegistrySyncable* pref_registry) OVERRIDE;

private:

virtual void ResetDefaultState() OVERRIDE;