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

Unified Diff: components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.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: components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc
diff --git a/components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc b/components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc
index 8742096dcae681ee06a0ef2402d9095f33c01ce4..b14f21f23bafec7dd3ba57a78059104e5499e0a6 100644
--- a/components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc
+++ b/components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc
@@ -19,9 +19,9 @@
#include "components/sync/model/sync_error_factory.h"
#include "components/sync/model/sync_error_factory_mock.h"
#include "components/sync/protocol/sync.pb.h"
-#include "components/syncable_prefs/pref_model_associator_client.h"
-#include "components/syncable_prefs/pref_service_mock_factory.h"
-#include "components/syncable_prefs/pref_service_syncable.h"
+#include "components/sync_preferences/pref_model_associator_client.h"
+#include "components/sync_preferences/pref_service_mock_factory.h"
+#include "components/sync_preferences/pref_service_syncable.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -98,7 +98,7 @@ syncer::SyncData CreatePrefSyncData(const std::string& name, bool value) {
// kPasswordManagerSavingEnabled preference, then it's PREFERENCE data type.
// If |name| is kCredentialsEnableService pref, then it's PRIORITY_PREFERENCE
// data type.
-void StartSyncingPref(syncable_prefs::PrefServiceSyncable* prefs,
+void StartSyncingPref(sync_preferences::PrefServiceSyncable* prefs,
const std::string& name,
BooleanPrefState pref_state_in_sync) {
syncer::SyncDataList sync_data_list;
@@ -138,7 +138,7 @@ class SyncServiceMock : public syncer::FakeSyncService {
};
class TestPrefModelAssociatorClient
- : public syncable_prefs::PrefModelAssociatorClient {
+ : public sync_preferences::PrefModelAssociatorClient {
public:
TestPrefModelAssociatorClient() {}
~TestPrefModelAssociatorClient() override {}
@@ -180,17 +180,17 @@ class PasswordManagerSettingMigratorServiceTest : public testing::Test {
ASSERT_TRUE(prefs()->FindPreference(name)->IsDefaultValue());
}
- syncable_prefs::PrefServiceSyncable* prefs() { return pref_service_.get(); }
+ sync_preferences::PrefServiceSyncable* prefs() { return pref_service_.get(); }
void SetupPreferenceMigrationEnvironment() {
- syncable_prefs::PrefServiceMockFactory factory;
+ sync_preferences::PrefServiceMockFactory factory;
factory.SetPrefModelAssociatorClient(&client_);
scoped_refptr<user_prefs::PrefRegistrySyncable> pref_registry(
new user_prefs::PrefRegistrySyncable);
password_manager::PasswordManager::RegisterProfilePrefs(
pref_registry.get());
- std::unique_ptr<syncable_prefs::PrefServiceSyncable> pref_service_syncable =
- factory.CreateSyncable(pref_registry.get());
+ std::unique_ptr<sync_preferences::PrefServiceSyncable>
+ pref_service_syncable = factory.CreateSyncable(pref_registry.get());
migration_service_.reset(
new PasswordManagerSettingMigratorService(pref_service_syncable.get()));
pref_service_.reset(pref_service_syncable.release());
@@ -221,7 +221,7 @@ class PasswordManagerSettingMigratorServiceTest : public testing::Test {
std::unique_ptr<base::FieldTrialList> field_trial_list_;
TestPrefModelAssociatorClient client_;
SyncServiceMock sync_service_;
- std::unique_ptr<syncable_prefs::PrefServiceSyncable> pref_service_;
+ std::unique_ptr<sync_preferences::PrefServiceSyncable> pref_service_;
std::unique_ptr<PasswordManagerSettingMigratorService> migration_service_;
DISALLOW_COPY_AND_ASSIGN(PasswordManagerSettingMigratorServiceTest);

Powered by Google App Engine
This is Rietveld 408576698