PasswordManager - update "password_manager_enabled_" pref name

chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/values.h"
 #include "chrome/browser/sync/test/integration/preferences_helper.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
@@ skipping 54 matching lines @@
   ASSERT_TRUE(StringPrefMatches(prefs::kHomePage));
 
   ChangeStringPref(0, prefs::kHomePage, "http://www.google.com/0");
   ChangeStringPref(1, prefs::kHomePage, "http://www.google.com/1");
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(StringPrefMatches(prefs::kHomePage));
 }
 
 // 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.
 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
                        kSyncKeepEverythingSynced) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   DisableVerifier();
 
   ASSERT_TRUE(
       BooleanPrefMatches(sync_driver::prefs::kSyncKeepEverythingSynced));
   ASSERT_TRUE(BooleanPrefMatches(sync_driver::prefs::kSyncThemes));
 
   GetClient(0)->DisableSyncForDatatype(syncer::THEMES);
   ASSERT_FALSE(
       BooleanPrefMatches(sync_driver::prefs::kSyncKeepEverythingSynced));
 }
 
 // TCM ID - 3661290.
 IN_PROC_BROWSER_TEST_F(LegacyTwoClientPreferencesSyncTest, DisablePreferences) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   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.
 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, DisableSync) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   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));
 }
 
 // TCM ID - 3604297.
 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, SignInDialog) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   DisableVerifier();
 
   ASSERT_TRUE(BooleanPrefMatches(sync_driver::prefs::kSyncPreferences));
   ASSERT_TRUE(BooleanPrefMatches(sync_driver::prefs::kSyncBookmarks));
@@ skipping 455 matching lines @@
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(IsEncryptionComplete(0));
   ASSERT_TRUE(IsEncryptionComplete(1));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage));
 
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
 }