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

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

Issue 14622003: components: Move PrefRegistrySyncable into user_prefs namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years, 7 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) 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/user_prefs/pref_registry_syncable.h" 10 #include "components/user_prefs/pref_registry_syncable.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 12
13 template<> 13 template <>
14 TestingPrefServiceBase<PrefServiceSyncable, PrefRegistrySyncable>:: 14 TestingPrefServiceBase<PrefServiceSyncable, user_prefs::PrefRegistrySyncable>::
15 TestingPrefServiceBase(TestingPrefStore* managed_prefs, 15 TestingPrefServiceBase(TestingPrefStore* managed_prefs,
16 TestingPrefStore* user_prefs, 16 TestingPrefStore* user_prefs,
17 TestingPrefStore* recommended_prefs, 17 TestingPrefStore* recommended_prefs,
18 PrefRegistrySyncable* pref_registry, 18 user_prefs::PrefRegistrySyncable* pref_registry,
19 PrefNotifierImpl* pref_notifier) 19 PrefNotifierImpl* pref_notifier)
20 : PrefServiceSyncable( 20 : PrefServiceSyncable(
21 pref_notifier, 21 pref_notifier,
22 new PrefValueStore( 22 new PrefValueStore(managed_prefs,
23 managed_prefs, 23 NULL,
24 NULL, 24 NULL,
25 NULL, 25 user_prefs,
26 user_prefs, 26 recommended_prefs,
27 recommended_prefs, 27 pref_registry->defaults(),
28 pref_registry->defaults(), 28 pref_notifier),
29 pref_notifier), 29 user_prefs,
30 user_prefs, 30 pref_registry,
31 pref_registry, 31 base::Bind(&TestingPrefServiceBase<
32 base::Bind( 32 PrefServiceSyncable,
33 &TestingPrefServiceBase<PrefServiceSyncable, 33 user_prefs::PrefRegistrySyncable>::HandleReadError),
34 PrefRegistrySyncable>::HandleReadError), 34 false),
35 false),
36 managed_prefs_(managed_prefs), 35 managed_prefs_(managed_prefs),
37 user_prefs_(user_prefs), 36 user_prefs_(user_prefs),
38 recommended_prefs_(recommended_prefs) { 37 recommended_prefs_(recommended_prefs) {}
39 }
40 38
41 TestingPrefServiceSyncable::TestingPrefServiceSyncable() 39 TestingPrefServiceSyncable::TestingPrefServiceSyncable()
42 : TestingPrefServiceBase<PrefServiceSyncable, PrefRegistrySyncable>( 40 : TestingPrefServiceBase<PrefServiceSyncable,
41 user_prefs::PrefRegistrySyncable>(
43 new TestingPrefStore(), 42 new TestingPrefStore(),
44 new TestingPrefStore(), 43 new TestingPrefStore(),
45 new TestingPrefStore(), 44 new TestingPrefStore(),
46 new PrefRegistrySyncable(), 45 new user_prefs::PrefRegistrySyncable(),
47 new PrefNotifierImpl()) { 46 new PrefNotifierImpl()) {
48 } 47 }
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 PrefRegistrySyncable* pref_registry, 53 user_prefs::PrefRegistrySyncable* pref_registry,
55 PrefNotifierImpl* pref_notifier) 54 PrefNotifierImpl* pref_notifier)
56 : TestingPrefServiceBase<PrefServiceSyncable, PrefRegistrySyncable>( 55 : TestingPrefServiceBase<PrefServiceSyncable,
56 user_prefs::PrefRegistrySyncable>(
57 managed_prefs, 57 managed_prefs,
58 user_prefs, 58 user_prefs,
59 recommended_prefs, 59 recommended_prefs,
60 pref_registry, 60 pref_registry,
61 pref_notifier) { 61 pref_notifier) {
62 } 62 }
63 63
64 TestingPrefServiceSyncable::~TestingPrefServiceSyncable() { 64 TestingPrefServiceSyncable::~TestingPrefServiceSyncable() {
65 } 65 }
66 66
67 PrefRegistrySyncable* TestingPrefServiceSyncable::registry() { 67 user_prefs::PrefRegistrySyncable* TestingPrefServiceSyncable::registry() {
68 return static_cast<PrefRegistrySyncable*>(DeprecatedGetPrefRegistry()); 68 return static_cast<user_prefs::PrefRegistrySyncable*>(
69 DeprecatedGetPrefRegistry());
69 } 70 }
OLDNEW
« no previous file with comments | « chrome/test/base/testing_pref_service_syncable.h ('k') | components/autofill/browser/autofill_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698