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

Unified 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, 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
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/testing_pref_service_syncable.cc
diff --git a/chrome/test/base/testing_pref_service_syncable.cc b/chrome/test/base/testing_pref_service_syncable.cc
index e52ae84b569ea26db99d21140c056f443f8fad90..168d56e15ceebfdd249513f0b45540e1305db375 100644
--- a/chrome/test/base/testing_pref_service_syncable.cc
+++ b/chrome/test/base/testing_pref_service_syncable.cc
@@ -10,40 +10,39 @@
#include "components/user_prefs/pref_registry_syncable.h"
#include "testing/gtest/include/gtest/gtest.h"
-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)
: PrefServiceSyncable(
- pref_notifier,
- new PrefValueStore(
- managed_prefs,
- NULL,
- NULL,
- user_prefs,
- recommended_prefs,
- pref_registry->defaults(),
- pref_notifier),
- user_prefs,
- pref_registry,
- base::Bind(
- &TestingPrefServiceBase<PrefServiceSyncable,
- PrefRegistrySyncable>::HandleReadError),
- false),
+ pref_notifier,
+ new PrefValueStore(managed_prefs,
+ NULL,
+ NULL,
+ user_prefs,
+ recommended_prefs,
+ pref_registry->defaults(),
+ pref_notifier),
+ user_prefs,
+ pref_registry,
+ base::Bind(&TestingPrefServiceBase<
+ PrefServiceSyncable,
+ user_prefs::PrefRegistrySyncable>::HandleReadError),
+ false),
managed_prefs_(managed_prefs),
user_prefs_(user_prefs),
- recommended_prefs_(recommended_prefs) {
-}
+ recommended_prefs_(recommended_prefs) {}
TestingPrefServiceSyncable::TestingPrefServiceSyncable()
- : TestingPrefServiceBase<PrefServiceSyncable, PrefRegistrySyncable>(
+ : TestingPrefServiceBase<PrefServiceSyncable,
+ user_prefs::PrefRegistrySyncable>(
new TestingPrefStore(),
new TestingPrefStore(),
new TestingPrefStore(),
- new PrefRegistrySyncable(),
+ new user_prefs::PrefRegistrySyncable(),
new PrefNotifierImpl()) {
}
@@ -51,9 +50,10 @@ TestingPrefServiceSyncable::TestingPrefServiceSyncable(
TestingPrefStore* managed_prefs,
TestingPrefStore* user_prefs,
TestingPrefStore* recommended_prefs,
- PrefRegistrySyncable* pref_registry,
+ user_prefs::PrefRegistrySyncable* pref_registry,
PrefNotifierImpl* pref_notifier)
- : TestingPrefServiceBase<PrefServiceSyncable, PrefRegistrySyncable>(
+ : TestingPrefServiceBase<PrefServiceSyncable,
+ user_prefs::PrefRegistrySyncable>(
managed_prefs,
user_prefs,
recommended_prefs,
@@ -64,6 +64,7 @@ TestingPrefServiceSyncable::TestingPrefServiceSyncable(
TestingPrefServiceSyncable::~TestingPrefServiceSyncable() {
}
-PrefRegistrySyncable* TestingPrefServiceSyncable::registry() {
- return static_cast<PrefRegistrySyncable*>(DeprecatedGetPrefRegistry());
+user_prefs::PrefRegistrySyncable* TestingPrefServiceSyncable::registry() {
+ return static_cast<user_prefs::PrefRegistrySyncable*>(
+ DeprecatedGetPrefRegistry());
}
« 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