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

Unified 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, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/test/base/testing_pref_service_syncable.h
diff --git a/chrome/test/base/testing_pref_service_syncable.h b/chrome/test/base/testing_pref_service_syncable.h
index ccd47acadd144f812876a5dbb703420770024255..57b0398505c51fbbf1bd2e40f61a0a9dd04daa7c 100644
--- a/chrome/test/base/testing_pref_service_syncable.h
+++ b/chrome/test/base/testing_pref_service_syncable.h
@@ -9,38 +9,39 @@
#include "base/prefs/testing_pref_service.h"
#include "chrome/browser/prefs/pref_service_syncable.h"
+namespace user_prefs {
class PrefRegistrySyncable;
+}
// Test version of PrefServiceSyncable.
class TestingPrefServiceSyncable
- : public TestingPrefServiceBase<PrefServiceSyncable, PrefRegistrySyncable> {
+ : public TestingPrefServiceBase<PrefServiceSyncable,
+ user_prefs::PrefRegistrySyncable> {
public:
TestingPrefServiceSyncable();
- TestingPrefServiceSyncable(
- TestingPrefStore* managed_prefs,
- TestingPrefStore* user_prefs,
- TestingPrefStore* recommended_prefs,
- PrefRegistrySyncable* pref_registry,
- PrefNotifierImpl* pref_notifier);
+ TestingPrefServiceSyncable(TestingPrefStore* managed_prefs,
+ TestingPrefStore* user_prefs,
+ TestingPrefStore* recommended_prefs,
+ user_prefs::PrefRegistrySyncable* pref_registry,
+ PrefNotifierImpl* pref_notifier);
virtual ~TestingPrefServiceSyncable();
// This is provided as a convenience; on a production PrefService
// you would do all registrations before constructing it, passing it
// a PrefRegistry via its constructor (or via e.g. PrefServiceBuilder).
- PrefRegistrySyncable* registry();
+ user_prefs::PrefRegistrySyncable* registry();
private:
DISALLOW_COPY_AND_ASSIGN(TestingPrefServiceSyncable);
};
-template<>
-TestingPrefServiceBase<PrefServiceSyncable, PrefRegistrySyncable>::
- TestingPrefServiceBase(
- TestingPrefStore* managed_prefs,
- TestingPrefStore* user_prefs,
- TestingPrefStore* recommended_prefs,
- PrefRegistrySyncable* pref_registry,
- PrefNotifierImpl* pref_notifier);
+template <>
+TestingPrefServiceBase<PrefServiceSyncable, user_prefs::PrefRegistrySyncable>::
+ TestingPrefServiceBase(TestingPrefStore* managed_prefs,
+ TestingPrefStore* user_prefs,
+ TestingPrefStore* recommended_prefs,
+ user_prefs::PrefRegistrySyncable* pref_registry,
+ PrefNotifierImpl* pref_notifier);
#endif // CHROME_TEST_BASE_TESTING_PREF_SERVICE_SYNCABLE_H_
« 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