Start the migration of passwords from the Keychain.

components/password_manager/core/common/password_manager_pref_names.h

Index: components/password_manager/core/common/password_manager_pref_names.h
diff --git a/components/password_manager/core/common/password_manager_pref_names.h b/components/password_manager/core/common/password_manager_pref_names.h
index 806082809daddf4a2cd21abc1b7fe43a0d4c5542..55099ac33552d094ba8af4de2e69462c91582735 100644
--- a/components/password_manager/core/common/password_manager_pref_names.h
+++ b/components/password_manager/core/common/password_manager_pref_names.h
@@ -8,6 +8,26 @@
 #include "base/basictypes.h"
 
 namespace password_manager {
+
+#if defined(OS_MACOSX)
+// Status of password migration from the Keychain.
+enum class MigrationStatus {

[Ilya Sherman, 2015/07/07 02:48:22]

Please document that this enum is used to back a histogram, and should therefore
be treated as append-only.

[vasilii, 2015/07/07 15:45:54]

Done.

+  // Migration wasn't tried yet.
+  NOT_STARTED = 0,
+
+  // Migration finished successfully.
+  MIGRATED,
+
+  // Migration failed once. It should be tried again.
+  FAILED_ONCE,
+
+  // Migration failed twice. It should not be tried again.
+  FAILED_TWICE,
+
+  NUM_MIGRATION_STATUS,

[Ilya Sherman, 2015/07/07 02:48:22]

nit: either "NUM_MIGRATIN_STATUSES" or "MIGRATION_STATUS_COUNT" (or just
"NUM_STATUSES" or "COUNT", since this is an enum class).

[vasilii, 2015/07/07 15:45:54]

Done.

+};
+#endif

[Ilya Sherman, 2015/07/07 02:48:22]

nit: These are not pref names.  Please declare them in a different header file.

[vasilii, 2015/07/07 15:45:54]

Done.

+
 namespace prefs {
 
 // Alphabetical list of preference names specific to the PasswordManager
@@ -35,6 +55,12 @@ extern const char kOsPasswordBlank[];
 extern const char kOsPasswordLastChanged[];
 #endif
 
+#if defined(OS_MACOSX)
+// The current status of migrating the passwords from the Keychain to the
+// database. Stores a value from MigrationStatus.
+extern const char kKeychainMigrationStatus[];
+#endif
+
 // Boolean controlling whether the password manager allows to retrieve passwords
 // in clear text.
 extern const char kPasswordManagerAllowShowPasswords[];