chrome/browser/prefs/pref_service_mock_builder.cc - 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.cc

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.cc

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

index dc2803cb982c6373fe487734d5cd5865af33b0d0..51ae6fb8e11c9c6001d3a6dd8e2c1aafa336cb47 100644

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

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

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

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

#include "base/prefs/testing_pref_store.h"

+#include "chrome/browser/prefs/pref_registry_syncable.h"

PrefServiceMockBuilder::PrefServiceMockBuilder() {

ResetDefaultState();

@@ -17,8 +18,10 @@ PrefService* PrefServiceMockBuilder::Create(PrefRegistry* pref_registry) {

return service;

}

-PrefServiceSyncable* PrefServiceMockBuilder::CreateSyncable() {

- PrefServiceSyncable* service = PrefServiceSyncableBuilder::CreateSyncable();

+PrefServiceSyncable* PrefServiceMockBuilder::CreateSyncable(

+ PrefRegistrySyncable* pref_registry) {

+ PrefServiceSyncable* service =

+ PrefServiceSyncableBuilder::CreateSyncable(pref_registry);

return service;

}