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

components/password_manager/core/browser/login_database.h

 // 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.
 
 #ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_LOGIN_DATABASE_H_
 #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_LOGIN_DATABASE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/pickle.h"
 #include "base/strings/string16.h"
+#include "components/password_manager/core/browser/password_store_change.h"
 #include "components/password_manager/core/browser/psl_matching_helper.h"
 #include "sql/connection.h"
 #include "sql/meta_table.h"
 
-namespace autofill {
-struct PasswordForm;
-}  // namespace autofill
-
 namespace password_manager {
 
 // Interface to the database storage of login information, intended as a helper
 // for PasswordStore on platforms that need internal storage of some or all of
 // the login information.
 class LoginDatabase {
  public:
   LoginDatabase();
   virtual ~LoginDatabase();
 
   // Initialize the database with an sqlite file at the given path.
   // If false is returned, no other method should be called.
   bool Init(const base::FilePath& db_path);
 
   // Reports usage metrics to UMA.
   void ReportMetrics();
 
-  // Adds |form| to the list of remembered password forms.
-  bool AddLogin(const autofill::PasswordForm& form);
+  // Adds |form| to the list of remembered password forms. Returns the list of
+  // changes applied ({}, {ADD}, {REMOVE, ADD}). If it returns {REMOVE, ADD}
+  // then the REMOVE is associated with the form that was added. Thus only the
+  // primary key columns contain the values associated with the removed form.
+  PasswordStoreChangeList AddLogin(const autofill::PasswordForm& form);
 
   // Updates remembered password form. Returns true on success and sets
   // items_changed (if non-NULL) to the number of logins updated.
   bool UpdateLogin(const autofill::PasswordForm& form, int* items_changed);
 
   // Removes |form| from the list of remembered password forms.
   bool RemoveLogin(const autofill::PasswordForm& form);
 
   // Removes all logins created from |delete_begin| onwards (inclusive) and
   // before |delete_end|. You may use a null Time value to do an unbounded
@@ skipping 24 matching lines @@
   bool GetBlacklistLogins(
       std::vector<autofill::PasswordForm*>* forms) const;
 
   // Deletes the login database file on disk, and creates a new, empty database.
   // This can be used after migrating passwords to some other store, to ensure
   // that SQLite doesn't leave fragments of passwords in the database file.
   // Returns true on success; otherwise, whether the file was deleted and
   // whether further use of this login database will succeed is unspecified.
   bool DeleteAndRecreateDatabaseFile();
 
+  // Serialization routines for vectors.

[Garrett Casto, 2014/05/14 18:34:48]

These routines really shouldn't be externally visible and the tests that call
them directly should instead make sure that saving and loading a form with
interesting other_possible_usernames will match correctly. If you don't want to
do this now, please put a TODO for me to clean this up.

[vasilii, 2014/05/15 08:36:52]

Done.

+  static Pickle SerializeVector(const std::vector<base::string16>& vec);
+  static std::vector<base::string16> DeserializeVector(const Pickle& pickle);
+
  private:
-  friend class LoginDatabaseTest;
-
   // Result values for encryption/decryption actions.
   enum EncryptionResult {
     // Success.
     ENCRYPTION_RESULT_SUCCESS,
     // Failure for a specific item (e.g., the encrypted value was manually
     // moved from another machine, and can't be decrypted on this machine).
     // This is presumed to be a permanent failure.
     ENCRYPTION_RESULT_ITEM_FAILURE,
     // A service-level failure (e.g., on a platform using a keyring, the keyring
     // is temporarily unavailable).
@@ skipping 23 matching lines @@
   // Returns the EncryptionResult from decrypting the password in |s|; if not
   // ENCRYPTION_RESULT_SUCCESS, |form| is not filled.
   EncryptionResult InitPasswordFormFromStatement(autofill::PasswordForm* form,
                                                  sql::Statement& s) const;
 
   // Loads all logins whose blacklist setting matches |blacklisted| into
   // |forms|.
   bool GetAllLoginsWithBlacklistSetting(
       bool blacklisted, std::vector<autofill::PasswordForm*>* forms) const;
 
-  // Serialization routines for vectors.
-  Pickle SerializeVector(const std::vector<base::string16>& vec) const;
-  std::vector<base::string16> DeserializeVector(const Pickle& pickle) const;
-
   base::FilePath db_path_;
   mutable sql::Connection db_;
   sql::MetaTable meta_table_;
 
   PSLMatchingHelper psl_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(LoginDatabase);
 };
 
 }  // namespace password_manager
 
 #endif  // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_LOGIN_DATABASE_H_