mac: Clean up autofill integration with Address Book.

components/autofill/core/browser/autofill_manager.cc

 // Copyright 2013 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/autofill/core/browser/autofill_manager.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <map>
@@ skipping 193 matching lines @@
 #if defined(OS_MACOSX) || defined(OS_ANDROID)
   registry->RegisterBooleanPref(
       prefs::kAutofillAuxiliaryProfilesEnabled,
       true,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 #else  // defined(OS_MACOSX) || defined(OS_ANDROID)
   registry->RegisterBooleanPref(
       prefs::kAutofillAuxiliaryProfilesEnabled,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 #endif  // defined(OS_MACOSX) || defined(OS_ANDROID)

[Ilya Sherman, 2014/06/02 22:54:27]

This is only needed on Android now, right?  It's probably a good idea to rename
the pref if it's only used on Android, to clarify its semantics.

[erikchen, 2014/06/03 01:34:19]

Done. I've kept the OS_MACOSX preprocessor conditional for consistency.

 #if defined(OS_MACOSX)
   registry->RegisterBooleanPref(
       prefs::kAutofillAuxiliaryProfilesQueried,

[Ilya Sherman, 2014/06/02 22:54:27]

nit: It's probably worth renaming this pref to match the new pref's name.

[erikchen, 2014/06/03 01:34:19]

Done.

       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 #endif  // defined(OS_MACOSX)
   registry->RegisterDoublePref(
       prefs::kAutofillPositiveUploadRate,
       kAutofillPositiveUploadRateDefaultValue,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterDoublePref(
       prefs::kAutofillNegativeUploadRate,
       kAutofillNegativeUploadRateDefaultValue,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+  registry->RegisterBooleanPref(
+      prefs::kAutofillUseMacAddressBook,
+      false,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(
+      prefs::kAutofillUseMacAddressBookMigration,

[Ilya Sherman, 2014/06/02 22:54:27]

Optional nit: Perhaps something more like
"kAutofillHasMigratedUseMacAddressBookPref"?

[erikchen, 2014/06/03 01:34:19]

Done.

+      false,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+#endif
 }
 
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+void AutofillManager::MigrateUserPrefs(PrefService* prefs) {
+  if (prefs->GetBoolean(prefs::kAutofillUseMacAddressBookMigration))
+    return;
+
+  // Whether Chrome has already tried to access the user's Address Book.
+  bool accessed = prefs->GetBoolean(prefs::kAutofillAuxiliaryProfilesQueried);
+  // Whether the user wants to use the Address Book to populate autofill.
+  bool enabled = prefs->GetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled);
+
+  prefs->SetBoolean(prefs::kAutofillUseMacAddressBook, accessed && enabled);
+  prefs->SetBoolean(prefs::kAutofillUseMacAddressBookMigration, true);
+}
+#endif
+
 void AutofillManager::SetExternalDelegate(AutofillExternalDelegate* delegate) {
   // TODO(jrg): consider passing delegate into the ctor.  That won't
   // work if the delegate has a pointer to the AutofillManager, but
   // future directions may not need such a pointer.
   external_delegate_ = delegate;
   autocomplete_history_manager_->SetExternalDelegate(delegate);
 }
 
 void AutofillManager::ShowAutofillSettings() {
   manager_delegate_->ShowAutofillSettings();
@@ skipping 919 matching lines @@
     return false;
 
   // Disregard forms that we wouldn't ever autofill in the first place.
   if (!form.ShouldBeParsed(true))
     return false;
 
   return true;
 }
 
 }  // namespace autofill