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 186 matching lines @@
     const char* name_on_card, const char* card_number,
     const char* expiration_month, const char* expiration_year) {
   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)

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

I bet you can skip the line below for iOS as well (or does iOS have a similar
Keychain concept?), and thusly combine the two #ifs.

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

A cursory inspection did not reveal any reason why chrome for iOS would not use
keychain, so I didn't touch this ifdef.

   OSCrypt::UseMockKeychain(true);
 #endif
 
+#if defined(OS_MACOSX) && !defined(OS_IOS)
   // Disable auxiliary profiles for unit testing.  These reach out to system
   // services on the Mac.
   if (prefs)
-    prefs->SetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled, false);
+    prefs->SetBoolean(prefs::kAutofillUseMacAddressBook, false);
+#endif

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

nit: Please add the trailing comment.

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

Done.

 }
 
 }  // namespace test
 }  // namespace autofill