mac: Clean up autofill integration with Address Book.

components/autofill/core/browser/autofill_test_utils.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_test_utils.h"
 
 #include "base/guid.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/pref_service_factory.h"
 #include "base/prefs/testing_pref_store.h"
@@ skipping 188 matching lines @@
   check_and_set(credit_card, CREDIT_CARD_NAME, name_on_card);
   check_and_set(credit_card, CREDIT_CARD_NUMBER, card_number);
   check_and_set(credit_card, CREDIT_CARD_EXP_MONTH, expiration_month);
   check_and_set(credit_card, CREDIT_CARD_EXP_4_DIGIT_YEAR, expiration_year);
 }
 
 void DisableSystemServices(PrefService* prefs) {
   // Use a mock Keychain rather than the OS one to store credit card data.
 #if defined(OS_MACOSX)
   OSCrypt::UseMockKeychain(true);
-#endif
+#endif  // defined(OS_MACOSX)
 
-  // Disable auxiliary profiles for unit testing.  These reach out to system
-  // services on the Mac.
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+  // Don't use the Address Book on Mac, as it reaches out to system services.
+  if (prefs)
+    prefs->SetBoolean(prefs::kAutofillUseMacAddressBook, false);
+#else
+  // Disable auxiliary profiles for unit testing by default.
   if (prefs)
     prefs->SetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled, false);
+#endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 }
 
 }  // namespace test
 }  // namespace autofill