mac: Clean up autofill integration with Address Book.

components/autofill/core/common/autofill_pref_names.cc

Index: components/autofill/core/common/autofill_pref_names.cc
diff --git a/components/autofill/core/common/autofill_pref_names.cc b/components/autofill/core/common/autofill_pref_names.cc
index d7385bb366b02091c4a2ff424e0459dfa904a606..d32b896c84ecb955c9938d17b46198aec6194e1c 100644
--- a/components/autofill/core/common/autofill_pref_names.cc
+++ b/components/autofill/core/common/autofill_pref_names.cc
@@ -7,15 +7,16 @@
 namespace autofill {
 namespace prefs {
 
-// Boolean that is true when auxiliary Autofill profiles are enabled.
-// Currently applies to Address Book "me" card on Mac.  False on Win and Linux.
-const char kAutofillAuxiliaryProfilesEnabled[] =
+// Boolean that is true when auxiliary Autofill profiles are enabled. This pref
+// is only relevant to Android.
+const char kAutofillAndroidAuxiliaryProfilesEnabled[] =
     "autofill.auxiliary_profiles_enabled";
 
-// Boolean that is true when at least one read request for auxiliary Autofill
-// profiles has been issued.  Currently applies only to auxiliary profiles on
-// Mac.
-const char kAutofillAuxiliaryProfilesQueried[] =
+// Boolean that is true when Chrome has attempted to access the user's Address
+// Book on mac. This preference is important since the first time Chrome

[Ilya Sherman, 2014/06/03 23:48:59]

nit: "mac" -> "Mac"

[erikchen, 2014/06/04 01:51:26]

Done.

+// attempts to access the user's Address Book, Cocoa presents a blocking dialog
+// to the user.
+const char kAutofillMacAddressBookQueried[] =
     "autofill.auxiliary_profiles_queried";
 
 // Boolean that is true if Autofill is enabled and allowed to save profile data.
@@ -27,5 +28,16 @@ const char kAutofillNegativeUploadRate[] = "autofill.negative_upload_rate";
 // Double that indicates positive (for matched forms) upload rate.
 const char kAutofillPositiveUploadRate[] = "autofill.positive_upload_rate";
 
+// Whether Autofill should try to use the Mac Address Book. If this value is
+// true, then kAutofillMacAddressBookQueried is expected to also be true.
+const char kAutofillUseMacAddressBook[] = "autofill.use_mac_address_book";
+
+// Whether the migration from kAutofillAndroidAuxiliaryProfilesEnabled to
+// kAutofillUseMacAddressBook has been performed. The old preference was
+// synced, and the new preference is not synced. The migration is not synced,
+// and needs to be performed once on each installed instance of Chrome.
+const char kAutofillHasMigratedUseMacAddressBookPref[] =
+    "autofill.use_mac_address_book_migration";
+
 }  // namespace prefs
 }  // namespace autofill