PasswordManager - update "password_manager_enabled_" pref name

This patch updates password_manager_enabled_ to saving_passwords_enabled_
to avoid confusion. This setting controls whether to offer to save password
or not.

BUG=392387

Review URL: https://codereview.chromium.org/380713003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282367 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/api/preference/preference_api.cc

@@ -76,7 +76,8 @@ PrefMappingEntry kPrefMapping[] = {
      APIPermission::kPrivacy, APIPermission::kPrivacy},
     {"networkPredictionEnabled", prefs::kNetworkPredictionEnabled,
      APIPermission::kPrivacy, APIPermission::kPrivacy},
-    {"passwordSavingEnabled", password_manager::prefs::kPasswordManagerEnabled,
+    {"passwordSavingEnabled",
+     password_manager::prefs::kPasswordManagerSavingEnabled,
      APIPermission::kPrivacy, APIPermission::kPrivacy},
     {"protectedContentEnabled", prefs::kEnableDRM, APIPermission::kPrivacy,
      APIPermission::kPrivacy},

chrome/browser/extensions/api/preference/preference_apitest.cc

@@ -44,7 +44,7 @@ class ExtensionPreferenceApiTest : public ExtensionApiTest {
     EXPECT_TRUE(prefs->GetBoolean(prefs::kEnableTranslate));
     EXPECT_TRUE(prefs->GetBoolean(prefs::kNetworkPredictionEnabled));
     EXPECT_TRUE(prefs->GetBoolean(
-        password_manager::prefs::kPasswordManagerEnabled));
+        password_manager::prefs::kPasswordManagerSavingEnabled));
     EXPECT_TRUE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
     EXPECT_TRUE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
   }
@@ -63,7 +63,7 @@ class ExtensionPreferenceApiTest : public ExtensionApiTest {
     EXPECT_FALSE(prefs->GetBoolean(prefs::kEnableTranslate));
     EXPECT_FALSE(prefs->GetBoolean(prefs::kNetworkPredictionEnabled));
     EXPECT_FALSE(prefs->GetBoolean(
-        password_manager::prefs::kPasswordManagerEnabled));
+        password_manager::prefs::kPasswordManagerSavingEnabled));
     EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
     EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
   }
@@ -109,7 +109,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, MAYBE_Standard) {
   prefs->SetBoolean(prefs::kEnableReferrers, false);
   prefs->SetBoolean(prefs::kEnableTranslate, false);
   prefs->SetBoolean(prefs::kNetworkPredictionEnabled, false);
-  prefs->SetBoolean(password_manager::prefs::kPasswordManagerEnabled, false);
+  prefs->SetBoolean(password_manager::prefs::kPasswordManagerSavingEnabled,
+                    false);
   prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false);
   prefs->SetBoolean(prefs::kSearchSuggestEnabled, false);
 

chrome/browser/policy/configuration_policy_handler_list_factory.cc

@@ -97,7 +97,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
     prefs::kForceSafeSearch,
     base::Value::TYPE_BOOLEAN },
   { key::kPasswordManagerEnabled,
-    password_manager::prefs::kPasswordManagerEnabled,
+    password_manager::prefs::kPasswordManagerSavingEnabled,
     base::Value::TYPE_BOOLEAN },
   { key::kPasswordManagerAllowShowPasswords,
     password_manager::prefs::kPasswordManagerAllowShowPasswords,

components/password_manager/core/browser/password_form_manager_unittest.cc

@@ -56,7 +56,7 @@ class TestPasswordManagerClient : public StubPasswordManagerClient {
  public:
   explicit TestPasswordManagerClient(PasswordStore* password_store)
       : password_store_(password_store) {
-    prefs_.registry()->RegisterBooleanPref(prefs::kPasswordManagerEnabled,
+    prefs_.registry()->RegisterBooleanPref(prefs::kPasswordManagerSavingEnabled,
                                            true);
   }
 

components/password_manager/core/browser/password_generation_manager_unittest.cc

@@ -111,7 +111,7 @@ class PasswordGenerationManagerTest : public testing::Test {
     // it off to |client_|, as the initialization flow of |client_| will
     // indirectly cause those prefs to be immediately accessed.
     scoped_ptr<TestingPrefServiceSimple> prefs(new TestingPrefServiceSimple());
-    prefs->registry()->RegisterBooleanPref(prefs::kPasswordManagerEnabled,
+    prefs->registry()->RegisterBooleanPref(prefs::kPasswordManagerSavingEnabled,
                                            true);
     client_.reset(new TestPasswordManagerClient(prefs.PassAs<PrefService>()));
   }
@@ -142,7 +142,7 @@ TEST_F(PasswordGenerationManagerTest, IsGenerationEnabled) {
   // Enabling the PasswordManager and password sync should cause generation to
   // be enabled.
   PrefService* prefs = client_->GetPrefs();
-  prefs->SetBoolean(prefs::kPasswordManagerEnabled, true);
+  prefs->SetBoolean(prefs::kPasswordManagerSavingEnabled, true);
   client_->set_is_password_sync_enabled(true);
   EXPECT_TRUE(IsGenerationEnabled());
 
@@ -152,7 +152,7 @@ TEST_F(PasswordGenerationManagerTest, IsGenerationEnabled) {
 
   // Disabling the PasswordManager should cause generation to be disabled even
   // if syncing is enabled.
-  prefs->SetBoolean(prefs::kPasswordManagerEnabled, false);
+  prefs->SetBoolean(prefs::kPasswordManagerSavingEnabled, false);
   client_->set_is_password_sync_enabled(true);
   EXPECT_FALSE(IsGenerationEnabled());
 }
@@ -160,7 +160,7 @@ TEST_F(PasswordGenerationManagerTest, IsGenerationEnabled) {
 TEST_F(PasswordGenerationManagerTest, DetectAccountCreationForms) {
   // Setup so that IsGenerationEnabled() returns true.
   PrefService* prefs = client_->GetPrefs();
-  prefs->SetBoolean(prefs::kPasswordManagerEnabled, true);
+  prefs->SetBoolean(prefs::kPasswordManagerSavingEnabled, true);
   client_->set_is_password_sync_enabled(true);
 
   autofill::FormData login_form;
@@ -214,7 +214,7 @@ TEST_F(PasswordGenerationManagerTest, UpdatePasswordSyncStateIncognito) {
   // be disabled.
   GetTestDriver()->set_is_off_the_record(true);
   PrefService* prefs = client_->GetPrefs();
-  prefs->SetBoolean(prefs::kPasswordManagerEnabled, true);
+  prefs->SetBoolean(prefs::kPasswordManagerSavingEnabled, true);
   client_->set_is_password_sync_enabled(true);
 
   EXPECT_FALSE(IsGenerationEnabled());

components/password_manager/core/browser/password_manager.cc

@@ -62,7 +62,7 @@ const char PasswordManager::kOtherPossibleUsernamesExperiment[] =
 void PasswordManager::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
-      prefs::kPasswordManagerEnabled,
+      prefs::kPasswordManagerSavingEnabled,
       true,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(
@@ -77,10 +77,10 @@ PasswordManager::PasswordManager(PasswordManagerClient* client)
     : client_(client), driver_(client->GetDriver()) {
   DCHECK(client_);
   DCHECK(driver_);
-  password_manager_enabled_.Init(prefs::kPasswordManagerEnabled,
+  saving_passwords_enabled_.Init(prefs::kPasswordManagerSavingEnabled,
                                  client_->GetPrefs());
 
-  ReportMetrics(*password_manager_enabled_);
+  ReportMetrics(*saving_passwords_enabled_);
 }
 
 PasswordManager::~PasswordManager() {
@@ -117,8 +117,8 @@ bool PasswordManager::IsEnabledForCurrentPage() const {
 }
 
 bool PasswordManager::IsSavingEnabledForCurrentPage() const {
-  return *password_manager_enabled_ && !driver_->IsOffTheRecord() &&
-      IsEnabledForCurrentPage();
+  return *saving_passwords_enabled_ && !driver_->IsOffTheRecord() &&
+         IsEnabledForCurrentPage();
 }
 
 void PasswordManager::ProvisionallySavePassword(const PasswordForm& form) {
@@ -356,7 +356,7 @@ void PasswordManager::CreatePendingLoginManagers(
     // Avoid prompting the user for access to a password if they don't have
     // password saving enabled.
     PasswordStore::AuthorizationPromptPolicy prompt_policy =
-        *password_manager_enabled_ ? PasswordStore::ALLOW_PROMPT
+        *saving_passwords_enabled_ ? PasswordStore::ALLOW_PROMPT
                                    : PasswordStore::DISALLOW_PROMPT;
 
     manager->FetchMatchingLoginsFromPasswordStore(prompt_policy);

components/password_manager/core/browser/password_manager.h

@@ -183,9 +183,9 @@ class PasswordManager : public LoginModel {
   // The platform-level driver. Must outlive this class.
   PasswordManagerDriver* const driver_;
 
-  // Set to false to disable the password manager (will no longer ask if you
+  // Set to false to disable password saving (will no longer ask if you
   // want to save passwords but will continue to fill passwords).
-  BooleanPrefMember password_manager_enabled_;
+  BooleanPrefMember saving_passwords_enabled_;
 
   // Observers to be notified of LoginModel events.  This is mutable to allow
   // notification in const member functions.

components/password_manager/core/browser/password_manager_unittest.cc

@@ -76,7 +76,7 @@ class TestPasswordManager : public PasswordManager {
 class PasswordManagerTest : public testing::Test {
  protected:
   virtual void SetUp() {
-    prefs_.registry()->RegisterBooleanPref(prefs::kPasswordManagerEnabled,
+    prefs_.registry()->RegisterBooleanPref(prefs::kPasswordManagerSavingEnabled,
                                            true);
 
     store_ = new MockPasswordStore;
@@ -484,10 +484,10 @@ TEST_F(PasswordManagerTest, InitiallyInvisibleForm) {
 TEST_F(PasswordManagerTest, SavingDependsOnManagerEnabledPreference) {
   // Test that saving passwords depends on the password manager enabled
   // preference.
-  prefs_.SetUserPref(prefs::kPasswordManagerEnabled,
+  prefs_.SetUserPref(prefs::kPasswordManagerSavingEnabled,
                      base::Value::CreateBooleanValue(true));
   EXPECT_TRUE(manager()->IsSavingEnabledForCurrentPage());
-  prefs_.SetUserPref(prefs::kPasswordManagerEnabled,
+  prefs_.SetUserPref(prefs::kPasswordManagerSavingEnabled,
                      base::Value::CreateBooleanValue(false));
   EXPECT_FALSE(manager()->IsSavingEnabledForCurrentPage());
 }
@@ -498,7 +498,7 @@ TEST_F(PasswordManagerTest, FillPasswordsOnDisabledManager) {
   std::vector<PasswordForm*> result;
   PasswordForm* existing = new PasswordForm(MakeSimpleForm());
   result.push_back(existing);
-  prefs_.SetUserPref(prefs::kPasswordManagerEnabled,
+  prefs_.SetUserPref(prefs::kPasswordManagerSavingEnabled,
                      base::Value::CreateBooleanValue(false));
   EXPECT_CALL(driver_, FillPasswordForm(_));
   EXPECT_CALL(*store_.get(),

components/password_manager/core/common/password_manager_pref_names.cc

@@ -23,9 +23,13 @@ const char kOsPasswordLastChanged[] =
 const char kPasswordManagerAllowShowPasswords[] =
     "profile.password_manager_allow_show_passwords";
 
-// Boolean that is true if the password manager is on (will record new
-// passwords and fill in known passwords).
-const char kPasswordManagerEnabled[] = "profile.password_manager_enabled";
+// Boolean that is true if password saving is on (will record new
+// passwords and fill in known passwords). When it is false, it doesn't
+// ask if you want to save passwords but will continue to fill passwords.
+// Constant name and its value differ because of historical reasons as it
+// was not deemed important enough to add migration code just for name change.
+// See http://crbug.com/392387
+const char kPasswordManagerSavingEnabled[] = "profile.password_manager_enabled";
 
 // A list of numbers. Each number corresponds to one of the domains monitored
 // for save-password-prompt breakages. That number is a random index into

components/password_manager/core/common/password_manager_pref_names.h

@@ -18,7 +18,7 @@ extern const char kOsPasswordBlank[];
 extern const char kOsPasswordLastChanged[];
 #endif
 extern const char kPasswordManagerAllowShowPasswords[];
-extern const char kPasswordManagerEnabled[];
+extern const char kPasswordManagerSavingEnabled[];
 extern const char kPasswordManagerGroupsForDomains[];
 
 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && defined(OS_POSIX)