Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Side by Side 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/prefs/pref_service_mock_builder.h" 5 #include "chrome/browser/prefs/pref_service_mock_builder.h"
6 6
7 #include "base/prefs/testing_pref_store.h" 7 #include "base/prefs/testing_pref_store.h"
8 #include "chrome/browser/prefs/pref_registry_syncable.h"
8 9
9 PrefServiceMockBuilder::PrefServiceMockBuilder() { 10 PrefServiceMockBuilder::PrefServiceMockBuilder() {
10 ResetDefaultState(); 11 ResetDefaultState();
11 } 12 }
12 13
13 PrefServiceMockBuilder::~PrefServiceMockBuilder() {} 14 PrefServiceMockBuilder::~PrefServiceMockBuilder() {}
14 15
15 PrefService* PrefServiceMockBuilder::Create(PrefRegistry* pref_registry) { 16 PrefService* PrefServiceMockBuilder::Create(PrefRegistry* pref_registry) {
16 PrefService* service = PrefServiceBuilder::Create(pref_registry); 17 PrefService* service = PrefServiceBuilder::Create(pref_registry);
17 return service; 18 return service;
18 } 19 }
19 20
20 PrefServiceSyncable* PrefServiceMockBuilder::CreateSyncable() { 21 PrefServiceSyncable* PrefServiceMockBuilder::CreateSyncable(
21 PrefServiceSyncable* service = PrefServiceSyncableBuilder::CreateSyncable(); 22 PrefRegistrySyncable* pref_registry) {
23 PrefServiceSyncable* service =
24 PrefServiceSyncableBuilder::CreateSyncable(pref_registry);
22 return service; 25 return service;
23 } 26 }
24 27
25 void PrefServiceMockBuilder::ResetDefaultState() { 28 void PrefServiceMockBuilder::ResetDefaultState() {
26 user_prefs_ = new TestingPrefStore; 29 user_prefs_ = new TestingPrefStore;
27 } 30 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/pref_service_mock_builder.h ('k') | chrome/browser/prefs/pref_service_syncable.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698