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

Unified Diff: chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc

Issue 2459823002: [Sync] Rename syncable_prefs to sync_preferences. (Closed)
Patch Set: Created 4 years, 2 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/browser/prefs/synced_pref_change_registrar_browsertest.cc
diff --git a/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc b/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc
index f5cedd0f0348719e45ff3869b33968799df4f5d6..3c4cf7fbe43e297d904699313a11d59b66ebc4d3 100644
--- a/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc
+++ b/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc
@@ -27,8 +27,8 @@
#include "components/sync/model/sync_error_factory_mock.h"
#include "components/sync/model/syncable_service.h"
#include "components/sync/protocol/sync.pb.h"
-#include "components/syncable_prefs/synced_pref_change_registrar.h"
-#include "components/syncable_prefs/testing_pref_service_syncable.h"
+#include "components/sync_preferences/synced_pref_change_registrar.h"
+#include "components/sync_preferences/testing_pref_service_syncable.h"
#include "content/public/test/test_utils.h"
namespace {
@@ -82,11 +82,9 @@ class SyncedPrefChangeRegistrarTest : public InProcessBrowserTest {
return prefs_->GetBoolean(name.c_str());
}
- syncable_prefs::PrefServiceSyncable* prefs() const {
- return prefs_;
- }
+ sync_preferences::PrefServiceSyncable* prefs() const { return prefs_; }
- syncable_prefs::SyncedPrefChangeRegistrar* registrar() const {
+ sync_preferences::SyncedPrefChangeRegistrar* registrar() const {
return registrar_.get();
}
@@ -107,16 +105,16 @@ class SyncedPrefChangeRegistrarTest : public InProcessBrowserTest {
new syncer::FakeSyncChangeProcessor),
std::unique_ptr<syncer::SyncErrorFactory>(
new syncer::SyncErrorFactoryMock));
- registrar_.reset(new syncable_prefs::SyncedPrefChangeRegistrar(prefs_));
+ registrar_.reset(new sync_preferences::SyncedPrefChangeRegistrar(prefs_));
}
void TearDownOnMainThread() override { registrar_.reset(); }
- syncable_prefs::PrefServiceSyncable* prefs_;
+ sync_preferences::PrefServiceSyncable* prefs_;
syncer::SyncableService* syncer_;
int next_sync_data_id_;
- std::unique_ptr<syncable_prefs::SyncedPrefChangeRegistrar> registrar_;
+ std::unique_ptr<sync_preferences::SyncedPrefChangeRegistrar> registrar_;
policy::MockConfigurationPolicyProvider policy_provider_;
};

Powered by Google App Engine
This is Rietveld 408576698