PasswordManager - update "password_manager_enabled_" pref name

components/password_manager/core/browser/password_manager.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 "components/password_manager/core/browser/password_manager.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 44 matching lines @@
 
 }  // namespace
 
 const char PasswordManager::kOtherPossibleUsernamesExperiment[] =
     "PasswordManagerOtherPossibleUsernames";
 
 // static
 void PasswordManager::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
-      prefs::kPasswordManagerEnabled,
+      prefs::kPasswordManagerSavingEnabled,
       true,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kPasswordManagerAllowShowPasswords,
       true,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterListPref(prefs::kPasswordManagerGroupsForDomains,
                              user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 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() {
   FOR_EACH_OBSERVER(LoginModelObserver, observers_, OnLoginModelDestroying());
 }
 
 void PasswordManager::SetFormHasGeneratedPassword(const PasswordForm& form) {
   DCHECK(IsSavingEnabledForCurrentPage());
 
   for (ScopedVector<PasswordFormManager>::iterator iter =
@@ skipping 16 matching lines @@
   manager->SetHasGeneratedPassword();
   // TODO(gcasto): Add UMA stats to track this.
 }
 
 bool PasswordManager::IsEnabledForCurrentPage() const {
   return !driver_->DidLastPageLoadEncounterSSLErrors() &&
       client_->IsPasswordManagerEnabledForCurrentPage();
 }
 
 bool PasswordManager::IsSavingEnabledForCurrentPage() const {
-  return *password_manager_enabled_ && !driver_->IsOffTheRecord() &&
-      IsEnabledForCurrentPage();
+  return *saving_passwords_enabled_ && !driver_->IsOffTheRecord() &&
+         IsEnabledForCurrentPage();
 }
 
 void PasswordManager::ProvisionallySavePassword(const PasswordForm& form) {
   bool is_saving_enabled = IsSavingEnabledForCurrentPage();
 
   scoped_ptr<BrowserSavePasswordProgressLogger> logger;
   if (client_->IsLoggingActive()) {
     logger.reset(new BrowserSavePasswordProgressLogger(client_));
     logger->LogMessage(Logger::STRING_PROVISIONALLY_SAVE_PASSWORD_METHOD);
     logger->LogPasswordForm(Logger::STRING_PROVISIONALLY_SAVE_PASSWORD_FORM,
@@ skipping 217 matching lines @@
       continue;  // The current form is already managed.
 
     bool ssl_valid = iter->origin.SchemeIsSecure();
     PasswordFormManager* manager =
         new PasswordFormManager(this, client_, driver_, *iter, ssl_valid);
     pending_login_managers_.push_back(manager);
 
     // 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);
   }
 }
 
 bool PasswordManager::ShouldPromptUserToSavePassword() const {
   return !client_->IsAutomaticPasswordSavingEnabled() &&
          provisional_save_manager_->IsNewLogin() &&
          !provisional_save_manager_->HasGeneratedPassword() &&
@@ skipping 152 matching lines @@
           observers_,
           OnAutofillDataAvailable(preferred_match.username_value,
                                   preferred_match.password_value));
       break;
   }
 
   client_->PasswordWasAutofilled(best_matches);
 }
 
 }  // namespace password_manager