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..036bb777cbf8800b5afcbc3594e87dcadf912571 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 {
+  // 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,
+};
+#endif
+
 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 the value from MigrationStatus.

[vabr (Chromium), 2015/07/06 09:50:19]

nit: the value -> a value
(The type does not hold a concrete value, as a variable would, so there is no
already defined "the value" to speak about.)

[vasilii, 2015/07/06 13:57:58]

Done.

+extern const char kKeychainMigrationStatus[];
+#endif
+
 // Boolean controlling whether the password manager allows to retrieve passwords
 // in clear text.
 extern const char kPasswordManagerAllowShowPasswords[];