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

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

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 #ifndef CHROME_TEST_BASE_TESTING_PREF_SERVICE_SYNCABLE_H_ 5 #ifndef CHROME_TEST_BASE_TESTING_PREF_SERVICE_SYNCABLE_H_
6 #define CHROME_TEST_BASE_TESTING_PREF_SERVICE_SYNCABLE_H_ 6 #define CHROME_TEST_BASE_TESTING_PREF_SERVICE_SYNCABLE_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/prefs/testing_pref_service.h" 9 #include "base/prefs/testing_pref_service.h"
10 #include "chrome/browser/prefs/pref_service_syncable.h" 10 #include "chrome/browser/prefs/pref_service_syncable.h"
11 11
12 namespace user_prefs {
12 class PrefRegistrySyncable; 13 class PrefRegistrySyncable;
14 }
13 15
14 // Test version of PrefServiceSyncable. 16 // Test version of PrefServiceSyncable.
15 class TestingPrefServiceSyncable 17 class TestingPrefServiceSyncable
16 : public TestingPrefServiceBase<PrefServiceSyncable, PrefRegistrySyncable> { 18 : public TestingPrefServiceBase<PrefServiceSyncable,
19 user_prefs::PrefRegistrySyncable> {
17 public: 20 public:
18 TestingPrefServiceSyncable(); 21 TestingPrefServiceSyncable();
19 TestingPrefServiceSyncable( 22 TestingPrefServiceSyncable(TestingPrefStore* managed_prefs,
20 TestingPrefStore* managed_prefs, 23 TestingPrefStore* user_prefs,
21 TestingPrefStore* user_prefs, 24 TestingPrefStore* recommended_prefs,
22 TestingPrefStore* recommended_prefs, 25 user_prefs::PrefRegistrySyncable* pref_registry,
23 PrefRegistrySyncable* pref_registry, 26 PrefNotifierImpl* pref_notifier);
24 PrefNotifierImpl* pref_notifier);
25 virtual ~TestingPrefServiceSyncable(); 27 virtual ~TestingPrefServiceSyncable();
26 28
27 // This is provided as a convenience; on a production PrefService 29 // This is provided as a convenience; on a production PrefService
28 // you would do all registrations before constructing it, passing it 30 // you would do all registrations before constructing it, passing it
29 // a PrefRegistry via its constructor (or via e.g. PrefServiceBuilder). 31 // a PrefRegistry via its constructor (or via e.g. PrefServiceBuilder).
30 PrefRegistrySyncable* registry(); 32 user_prefs::PrefRegistrySyncable* registry();
31 33
32 private: 34 private:
33 DISALLOW_COPY_AND_ASSIGN(TestingPrefServiceSyncable); 35 DISALLOW_COPY_AND_ASSIGN(TestingPrefServiceSyncable);
34 }; 36 };
35 37
36 template<> 38 template <>
37 TestingPrefServiceBase<PrefServiceSyncable, PrefRegistrySyncable>:: 39 TestingPrefServiceBase<PrefServiceSyncable, user_prefs::PrefRegistrySyncable>::
38 TestingPrefServiceBase( 40 TestingPrefServiceBase(TestingPrefStore* managed_prefs,
39 TestingPrefStore* managed_prefs, 41 TestingPrefStore* user_prefs,
40 TestingPrefStore* user_prefs, 42 TestingPrefStore* recommended_prefs,
41 TestingPrefStore* recommended_prefs, 43 user_prefs::PrefRegistrySyncable* pref_registry,
42 PrefRegistrySyncable* pref_registry, 44 PrefNotifierImpl* pref_notifier);
43 PrefNotifierImpl* pref_notifier);
44 45
45 #endif // CHROME_TEST_BASE_TESTING_PREF_SERVICE_SYNCABLE_H_ 46 #endif // CHROME_TEST_BASE_TESTING_PREF_SERVICE_SYNCABLE_H_
46 47
OLDNEW
« no previous file with comments | « chrome/browser/web_resource/promo_resource_service.cc ('k') | chrome/test/base/testing_pref_service_syncable.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698