Password Login Database: report correct changes from UpdateLogin().

components/password_manager/core/browser/login_database.cc

 // Copyright 2014 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/login_database.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/bind.h"
@@ skipping 317 matching lines @@
       " use_additional_auth) VALUES "
       "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"));
   BindAddStatement(form, encrypted_password, &s);
   if (s.Run()) {
     list.push_back(PasswordStoreChange(PasswordStoreChange::REMOVE, form));
     list.push_back(PasswordStoreChange(PasswordStoreChange::ADD, form));
   }
   return list;
 }
 
-bool LoginDatabase::UpdateLogin(const PasswordForm& form, int* items_changed) {
+PasswordStoreChangeList LoginDatabase::UpdateLogin(const PasswordForm& form) {
   std::string encrypted_password;
   if (EncryptedString(form.password_value, &encrypted_password) !=
           ENCRYPTION_RESULT_SUCCESS)
-    return false;
+    return PasswordStoreChangeList();
 
   // Replacement is necessary to deal with updating imported credentials. See
   // crbug.com/349138 for details.
   sql::Statement s(db_.GetCachedStatement(SQL_FROM_HERE,
       "UPDATE OR REPLACE logins SET "
       "action_url = ?, "
       "password_value = ?, "
       "ssl_valid = ?, "
       "preferred = ?, "
       "possible_usernames = ?, "
       "times_used = ?, "
-      "username_element = ?, "
-      "password_element = ?, "
       "submit_element = ? "
       "WHERE origin_url = ? AND "
-      "(username_element = ? OR username_element = '') AND "
+      "username_element = ? AND "
       "username_value = ? AND "
-      "(password_element = ? OR password_element = '') AND "
-      "(submit_element = ? OR submit_element = '') AND "
+      "password_element = ? AND "
       "signon_realm = ?"));
   s.BindString(0, form.action.spec());
   s.BindBlob(1, encrypted_password.data(),
              static_cast<int>(encrypted_password.length()));
   s.BindInt(2, form.ssl_valid);
   s.BindInt(3, form.preferred);
   Pickle pickle = SerializeVector(form.other_possible_usernames);
   s.BindBlob(4, pickle.data(), pickle.size());
   s.BindInt(5, form.times_used);
-  s.BindString16(6, form.username_element);
-  s.BindString16(7, form.password_element);
-  s.BindString16(8, form.submit_element);
+  s.BindString16(6, form.submit_element);
 
-  s.BindString(9, form.origin.spec());
-  s.BindString16(10, form.username_element);
-  s.BindString16(11, form.username_value);
-  s.BindString16(12, form.password_element);
-  s.BindString16(13, form.submit_element);
-  s.BindString(14, form.signon_realm);
+  s.BindString(7, form.origin.spec());
+  s.BindString16(8, form.username_element);
+  s.BindString16(9, form.username_value);
+  s.BindString16(10, form.password_element);
+  s.BindString(11, form.signon_realm);
 
   if (!s.Run())
-    return false;
+    return PasswordStoreChangeList();
 
-  if (items_changed)
-    *items_changed = db_.GetLastChangeCount();
+  PasswordStoreChangeList list;
+  if (db_.GetLastChangeCount())
+    list.push_back(PasswordStoreChange(PasswordStoreChange::UPDATE, form));
 
-  return true;
+  return list;
 }
 
 bool LoginDatabase::RemoveLogin(const PasswordForm& form) {
   // Remove a login by UNIQUE-constrained fields.
   sql::Statement s(db_.GetCachedStatement(SQL_FROM_HERE,
       "DELETE FROM logins WHERE "
       "origin_url = ? AND "
       "username_element = ? AND "
       "username_value = ? AND "
       "password_element = ? AND "
@@ skipping 232 matching lines @@
 
 bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
   DCHECK(db_.is_open());
   meta_table_.Reset();
   db_.Close();
   sql::Connection::Delete(db_path_);
   return Init(db_path_);
 }
 
 }  // namespace password_manager