mac: Clean up autofill integration with Address Book.

components/autofill/core/browser/personal_data_manager_mac.mm

 // 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/personal_data_manager.h"
 
 #include <math.h>
 
 #import <AddressBook/AddressBook.h>
 
@@ skipping 18 matching lines @@
 #include "ui/base/l10n/l10n_util_mac.h"
 
 namespace autofill {
 namespace {
 
 const char kAddressBookOrigin[] = "OS X Address Book";
 
 // Whether Chrome has prompted the user for permission to access the user's
 // address book.
 bool HasPromptedForAccessToAddressBook(PrefService* pref_service) {
-  return pref_service->GetBoolean(prefs::kAutofillAuxiliaryProfilesQueried);
+  return pref_service->GetBoolean(prefs::kAutofillMacAddressBookQueried);
+}
+
+// Whether the user wants Chrome to use the AddressBook to populate Autofill
+// entries.
+bool ShouldUseAddressBook(PrefService* pref_service) {
+  return pref_service->GetBoolean(prefs::kAutofillUseMacAddressBook);
 }
 
 ABAddressBook* GetAddressBook(PrefService* pref_service) {
   bool first_access = !HasPromptedForAccessToAddressBook(pref_service);
 
   // +[ABAddressBook sharedAddressBook] throws an exception internally in
   // circumstances that aren't clear. The exceptions are only observed in crash
   // reports, so it is unknown whether they would be caught by AppKit and nil
   // returned, or if they would take down the app. In either case, avoid
   // crashing. http://crbug.com/129022
   ABAddressBook* addressBook = base::mac::RunBlockIgnoringExceptions(
       ^{ return [ABAddressBook sharedAddressBook]; });
   UMA_HISTOGRAM_BOOLEAN("Autofill.AddressBookAvailable", addressBook != nil);
 
   if (first_access) {
     UMA_HISTOGRAM_BOOLEAN("Autofill.AddressBookAvailableOnFirstAttempt",
                           addressBook != nil);
   }
 
-  pref_service->SetBoolean(prefs::kAutofillAuxiliaryProfilesQueried, true);
+  pref_service->SetBoolean(prefs::kAutofillMacAddressBookQueried, true);
   return addressBook;
 }
 
 // This implementation makes use of the Address Book API.  Profiles are
 // generated that correspond to addresses in the "me" card that reside in the
 // user's Address Book.  The caller passes a vector of profiles into the
 // the constructer and then initiate the fetch from the Mac Address Book "me"
 // card using the main |GetAddressBookMeCard()| method.  This clears any
 // existing addresses and populates new addresses derived from the data found
 // in the "me" card.
@@ skipping 33 matching lines @@
 };
 
 // This method uses the |ABAddressBook| system service to fetch the "me" card
 // from the active user's address book.  It looks for the user address
 // information and translates it to the internal list of |AutofillProfile| data
 // structures.
 void AuxiliaryProfilesImpl::GetAddressBookMeCard(const std::string& app_locale,
                                                  PrefService* pref_service) {
   profiles_.clear();
 
-  // Chrome has not yet requested address book permissions. Attempting to do so
-  // presents a blocking modal dialog, which is undesirable. Instead, just show
-  // no results.
-  if (!HasPromptedForAccessToAddressBook(pref_service))
+  // The user does not want Chrome to use the AddressBook to populate Autofill
+  // entries.
+  if (!ShouldUseAddressBook(pref_service))
     return;
 
   ABAddressBook* addressBook = GetAddressBook(pref_service);
 
   ABPerson* me = [addressBook me];
   if (!me)
     return;
 
   ABMultiValue* addresses = [me valueForProperty:kABAddressProperty];
 
@@ skipping 170 matching lines @@
 
 }  // namespace
 
 // Populate |auxiliary_profiles_| with the Address Book data.
 void PersonalDataManager::LoadAuxiliaryProfiles() const {
   AuxiliaryProfilesImpl impl(&auxiliary_profiles_);
   impl.GetAddressBookMeCard(app_locale_, pref_service_);
 }
 
 bool PersonalDataManager::AccessAddressBook() {
-  if (!pref_service_->GetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled))
-    return false;
-
-  if (HasPromptedForAccessToAddressBook(pref_service_))
-    return false;
+  // The user is attempting to give Chrome access to the user's Address Book.
+  // This implicitly acknowledges that the user wants to use auxiliary
+  // profiles.
+  pref_service_->SetBoolean(prefs::kAutofillUseMacAddressBook, true);
 
   // Request permissions.
   GetAddressBook(pref_service_);
   return true;
 }
 
 bool PersonalDataManager::ShouldShowAccessAddressBookSuggestion(
     AutofillType type) {
-  if (!pref_service_->GetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled))
-    return false;
-
   if (HasPromptedForAccessToAddressBook(pref_service_))
     return false;
 
   switch (type.group()) {
     case ADDRESS_BILLING:
     case ADDRESS_HOME:
     case EMAIL:
     case NAME:
     case NAME_BILLING:
     case PHONE_BILLING:
     case PHONE_HOME:
       return true;
     case NO_GROUP:
     case COMPANY:
     case CREDIT_CARD:
     case PASSWORD_FIELD:
       return false;
   }
 
   return false;
 }
 
 }  // namespace autofill