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

Unified Diff: chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc

Issue 380713003: PasswordManager - update "password_manager_enabled_" pref name (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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/sync/test/integration/two_client_preferences_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
index 7f644173f4e8a837f1038c9ae4b1fcf6f0995894..653271723a0d8659f7ae09455e0a26a1f7fd98d6 100644
--- a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
@@ -72,15 +72,15 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, Race) {
// TCM ID - 3649278.
IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
- kPasswordManagerEnabled) {
+ kPasswordManagerSavingEnabled) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(
- BooleanPrefMatches(password_manager::prefs::kPasswordManagerEnabled));
+ ASSERT_TRUE(BooleanPrefMatches(
+ password_manager::prefs::kPasswordManagerSavingEnabled));
- ChangeBooleanPref(0, password_manager::prefs::kPasswordManagerEnabled);
+ ChangeBooleanPref(0, password_manager::prefs::kPasswordManagerSavingEnabled);
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(
- BooleanPrefMatches(password_manager::prefs::kPasswordManagerEnabled));
+ ASSERT_TRUE(BooleanPrefMatches(
+ password_manager::prefs::kPasswordManagerSavingEnabled));
}
// TCM ID - 3699293.
@@ -104,19 +104,19 @@ IN_PROC_BROWSER_TEST_F(LegacyTwoClientPreferencesSyncTest, DisablePreferences) {
DisableVerifier();
ASSERT_TRUE(BooleanPrefMatches(sync_driver::prefs::kSyncPreferences));
- ASSERT_TRUE(
- BooleanPrefMatches(password_manager::prefs::kPasswordManagerEnabled));
+ ASSERT_TRUE(BooleanPrefMatches(
+ password_manager::prefs::kPasswordManagerSavingEnabled));
GetClient(1)->DisableSyncForDatatype(syncer::PREFERENCES);
- ChangeBooleanPref(0, password_manager::prefs::kPasswordManagerEnabled);
+ ChangeBooleanPref(0, password_manager::prefs::kPasswordManagerSavingEnabled);
ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
- ASSERT_FALSE(
- BooleanPrefMatches(password_manager::prefs::kPasswordManagerEnabled));
+ ASSERT_FALSE(BooleanPrefMatches(
+ password_manager::prefs::kPasswordManagerSavingEnabled));
GetClient(1)->EnableSyncForDatatype(syncer::PREFERENCES);
ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(
- BooleanPrefMatches(password_manager::prefs::kPasswordManagerEnabled));
+ ASSERT_TRUE(BooleanPrefMatches(
+ password_manager::prefs::kPasswordManagerSavingEnabled));
}
// TCM ID - 3664292.
@@ -125,23 +125,23 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, DisableSync) {
DisableVerifier();
ASSERT_TRUE(BooleanPrefMatches(sync_driver::prefs::kSyncPreferences));
- ASSERT_TRUE(
- BooleanPrefMatches(password_manager::prefs::kPasswordManagerEnabled));
+ ASSERT_TRUE(BooleanPrefMatches(
+ password_manager::prefs::kPasswordManagerSavingEnabled));
ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
GetClient(1)->DisableSyncForAllDatatypes();
- ChangeBooleanPref(0, password_manager::prefs::kPasswordManagerEnabled);
+ ChangeBooleanPref(0, password_manager::prefs::kPasswordManagerSavingEnabled);
ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
- ASSERT_FALSE(
- BooleanPrefMatches(password_manager::prefs::kPasswordManagerEnabled));
+ ASSERT_FALSE(BooleanPrefMatches(
+ password_manager::prefs::kPasswordManagerSavingEnabled));
ChangeBooleanPref(1, prefs::kShowHomeButton);
ASSERT_FALSE(BooleanPrefMatches(prefs::kShowHomeButton));
GetClient(1)->EnableSyncForAllDatatypes();
ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(
- BooleanPrefMatches(password_manager::prefs::kPasswordManagerEnabled));
+ ASSERT_TRUE(BooleanPrefMatches(
+ password_manager::prefs::kPasswordManagerSavingEnabled));
ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
}

Powered by Google App Engine
This is Rietveld 408576698