| Index: components/sync_preferences/testing_pref_service_syncable.cc
|
| diff --git a/components/syncable_prefs/testing_pref_service_syncable.cc b/components/sync_preferences/testing_pref_service_syncable.cc
|
| similarity index 79%
|
| rename from components/syncable_prefs/testing_pref_service_syncable.cc
|
| rename to components/sync_preferences/testing_pref_service_syncable.cc
|
| index f05485a5f7d120051a23ebe46c00bdc2b26e3bdd..2fc6d3e1676c3c5414183630be30fa2dfae460c1 100644
|
| --- a/components/syncable_prefs/testing_pref_service_syncable.cc
|
| +++ b/components/sync_preferences/testing_pref_service_syncable.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "components/syncable_prefs/testing_pref_service_syncable.h"
|
| +#include "components/sync_preferences/testing_pref_service_syncable.h"
|
|
|
| #include "base/bind.h"
|
| #include "components/pref_registry/pref_registry_syncable.h"
|
| @@ -11,14 +11,14 @@
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| template <>
|
| -TestingPrefServiceBase<syncable_prefs::PrefServiceSyncable,
|
| +TestingPrefServiceBase<sync_preferences::PrefServiceSyncable,
|
| user_prefs::PrefRegistrySyncable>::
|
| TestingPrefServiceBase(TestingPrefStore* managed_prefs,
|
| TestingPrefStore* user_prefs,
|
| TestingPrefStore* recommended_prefs,
|
| user_prefs::PrefRegistrySyncable* pref_registry,
|
| PrefNotifierImpl* pref_notifier)
|
| - : syncable_prefs::PrefServiceSyncable(
|
| + : sync_preferences::PrefServiceSyncable(
|
| pref_notifier,
|
| new PrefValueStore(managed_prefs,
|
| nullptr, // supervised_user_prefs
|
| @@ -39,17 +39,16 @@ TestingPrefServiceBase<syncable_prefs::PrefServiceSyncable,
|
| user_prefs_(user_prefs),
|
| recommended_prefs_(recommended_prefs) {}
|
|
|
| -namespace syncable_prefs {
|
| +namespace sync_preferences {
|
|
|
| TestingPrefServiceSyncable::TestingPrefServiceSyncable()
|
| : TestingPrefServiceBase<PrefServiceSyncable,
|
| user_prefs::PrefRegistrySyncable>(
|
| - new TestingPrefStore(),
|
| - new TestingPrefStore(),
|
| - new TestingPrefStore(),
|
| - new user_prefs::PrefRegistrySyncable(),
|
| - new PrefNotifierImpl()) {
|
| -}
|
| + new TestingPrefStore(),
|
| + new TestingPrefStore(),
|
| + new TestingPrefStore(),
|
| + new user_prefs::PrefRegistrySyncable(),
|
| + new PrefNotifierImpl()) {}
|
|
|
| TestingPrefServiceSyncable::TestingPrefServiceSyncable(
|
| TestingPrefStore* managed_prefs,
|
| @@ -59,19 +58,17 @@ TestingPrefServiceSyncable::TestingPrefServiceSyncable(
|
| PrefNotifierImpl* pref_notifier)
|
| : TestingPrefServiceBase<PrefServiceSyncable,
|
| user_prefs::PrefRegistrySyncable>(
|
| - managed_prefs,
|
| - user_prefs,
|
| - recommended_prefs,
|
| - pref_registry,
|
| - pref_notifier) {
|
| -}
|
| + managed_prefs,
|
| + user_prefs,
|
| + recommended_prefs,
|
| + pref_registry,
|
| + pref_notifier) {}
|
|
|
| -TestingPrefServiceSyncable::~TestingPrefServiceSyncable() {
|
| -}
|
| +TestingPrefServiceSyncable::~TestingPrefServiceSyncable() {}
|
|
|
| user_prefs::PrefRegistrySyncable* TestingPrefServiceSyncable::registry() {
|
| return static_cast<user_prefs::PrefRegistrySyncable*>(
|
| DeprecatedGetPrefRegistry());
|
| }
|
|
|
| -} // namespace syncable_prefs
|
| +} // namespace sync_preferences
|
|
|