| Index: components/password_manager/core/browser/login_database.cc
|
| diff --git a/components/password_manager/core/browser/login_database.cc b/components/password_manager/core/browser/login_database.cc
|
| index e2067b61a2ffa6deef7de3bcccda09745135ddf2..f1c45b6fc00b0155a5913280724b6b1f291d4e65 100644
|
| --- a/components/password_manager/core/browser/login_database.cc
|
| +++ b/components/password_manager/core/browser/login_database.cc
|
| @@ -521,8 +521,7 @@ std::string GeneratePlaceholders(size_t count) {
|
| } // namespace
|
|
|
| LoginDatabase::LoginDatabase(const base::FilePath& db_path)
|
| - : db_path_(db_path), clear_password_values_(false) {
|
| -}
|
| + : db_path_(db_path) {}
|
|
|
| LoginDatabase::~LoginDatabase() {
|
| }
|
| @@ -814,9 +813,8 @@ PasswordStoreChangeList LoginDatabase::AddLogin(const PasswordForm& form) {
|
| if (!DoesMatchConstraints(form))
|
| return list;
|
| std::string encrypted_password;
|
| - if (EncryptedString(
|
| - clear_password_values_ ? base::string16() : form.password_value,
|
| - &encrypted_password) != ENCRYPTION_RESULT_SUCCESS)
|
| + if (EncryptedString(form.password_value, &encrypted_password) !=
|
| + ENCRYPTION_RESULT_SUCCESS)
|
| return list;
|
|
|
| DCHECK(!add_statement_.empty());
|
| @@ -844,9 +842,8 @@ PasswordStoreChangeList LoginDatabase::AddLogin(const PasswordForm& form) {
|
|
|
| PasswordStoreChangeList LoginDatabase::UpdateLogin(const PasswordForm& form) {
|
| std::string encrypted_password;
|
| - if (EncryptedString(
|
| - clear_password_values_ ? base::string16() : form.password_value,
|
| - &encrypted_password) != ENCRYPTION_RESULT_SUCCESS)
|
| + if (EncryptedString(form.password_value, &encrypted_password) !=
|
| + ENCRYPTION_RESULT_SUCCESS)
|
| return PasswordStoreChangeList();
|
|
|
| #if defined(OS_IOS)
|
|
|