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 286 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;
+  // 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::kAutofillAuxiliaryProfilesEnabled, true);
 
   if (HasPromptedForAccessToAddressBook(pref_service_))
     return false;
 
   // 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