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

Side by Side Diff: chrome/test/base/testing_pref_service_syncable.cc

Issue 1326353002: Remove dependency of PrefSyncableService on Profile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pref_model_associator
Patch Set: Move files back to //chrome/browser/prefs & //chrome/test/base Created 5 years, 3 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/test/base/testing_pref_service_syncable.h" 5 #include "chrome/test/base/testing_pref_service_syncable.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/prefs/pref_notifier_impl.h" 8 #include "base/prefs/pref_notifier_impl.h"
9 #include "base/prefs/pref_value_store.h" 9 #include "base/prefs/pref_value_store.h"
10 #include "components/pref_registry/pref_registry_syncable.h" 10 #include "components/pref_registry/pref_registry_syncable.h"
(...skipping 22 matching lines...) Expand all
33 PrefServiceSyncable, 33 PrefServiceSyncable,
34 user_prefs::PrefRegistrySyncable>::HandleReadError), 34 user_prefs::PrefRegistrySyncable>::HandleReadError),
35 false), 35 false),
36 managed_prefs_(managed_prefs), 36 managed_prefs_(managed_prefs),
37 user_prefs_(user_prefs), 37 user_prefs_(user_prefs),
38 recommended_prefs_(recommended_prefs) {} 38 recommended_prefs_(recommended_prefs) {}
39 39
40 TestingPrefServiceSyncable::TestingPrefServiceSyncable() 40 TestingPrefServiceSyncable::TestingPrefServiceSyncable()
41 : TestingPrefServiceBase<PrefServiceSyncable, 41 : TestingPrefServiceBase<PrefServiceSyncable,
42 user_prefs::PrefRegistrySyncable>( 42 user_prefs::PrefRegistrySyncable>(
43 new TestingPrefStore(), 43 new TestingPrefStore(),
44 new TestingPrefStore(), 44 new TestingPrefStore(),
45 new TestingPrefStore(), 45 new TestingPrefStore(),
46 new user_prefs::PrefRegistrySyncable(), 46 new user_prefs::PrefRegistrySyncable(),
47 new PrefNotifierImpl()) { 47 new PrefNotifierImpl()) {}
48 }
49 48
50 TestingPrefServiceSyncable::TestingPrefServiceSyncable( 49 TestingPrefServiceSyncable::TestingPrefServiceSyncable(
51 TestingPrefStore* managed_prefs, 50 TestingPrefStore* managed_prefs,
52 TestingPrefStore* user_prefs, 51 TestingPrefStore* user_prefs,
53 TestingPrefStore* recommended_prefs, 52 TestingPrefStore* recommended_prefs,
54 user_prefs::PrefRegistrySyncable* pref_registry, 53 user_prefs::PrefRegistrySyncable* pref_registry,
55 PrefNotifierImpl* pref_notifier) 54 PrefNotifierImpl* pref_notifier)
56 : TestingPrefServiceBase<PrefServiceSyncable, 55 : TestingPrefServiceBase<PrefServiceSyncable,
57 user_prefs::PrefRegistrySyncable>( 56 user_prefs::PrefRegistrySyncable>(
58 managed_prefs, 57 managed_prefs,
59 user_prefs, 58 user_prefs,
60 recommended_prefs, 59 recommended_prefs,
61 pref_registry, 60 pref_registry,
62 pref_notifier) { 61 pref_notifier) {}
63 }
64 62
65 TestingPrefServiceSyncable::~TestingPrefServiceSyncable() { 63 TestingPrefServiceSyncable::~TestingPrefServiceSyncable() {}
66 }
67 64
68 user_prefs::PrefRegistrySyncable* TestingPrefServiceSyncable::registry() { 65 user_prefs::PrefRegistrySyncable* TestingPrefServiceSyncable::registry() {
69 return static_cast<user_prefs::PrefRegistrySyncable*>( 66 return static_cast<user_prefs::PrefRegistrySyncable*>(
70 DeprecatedGetPrefRegistry()); 67 DeprecatedGetPrefRegistry());
71 } 68 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698