mac: Clean up autofill integration with Address Book.

components/autofill/core/browser/personal_data_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/personal_data_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 
@@ skipping 507 matching lines @@
        iter != credit_cards_.end(); ++iter) {
     (*iter)->GetNonEmptyTypes(app_locale_, non_empty_types);
   }
 }
 
 bool PersonalDataManager::IsDataLoaded() const {
   return is_data_loaded_;
 }
 
 const std::vector<AutofillProfile*>& PersonalDataManager::GetProfiles() const {
-  if (!pref_service_->GetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled)) {
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+  if (!pref_service_->GetBoolean(prefs::kAutofillUseMacAddressBook))
     return web_profiles();
-  }
+#else

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

nit: Should this be only on Android?

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

After the revert of the rename of the preference, there should not be any
confusion. The preference does not need to be ifdef'ed to be android only.

+  if (!pref_service_->GetBoolean(
+          prefs::kAutofillAndroidAuxiliaryProfilesEnabled))
+    return web_profiles();
+#endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 
   profiles_.clear();
 
   // Populates |auxiliary_profiles_|.
   LoadAuxiliaryProfiles();
 
   profiles_.insert(profiles_.end(), web_profiles_.begin(), web_profiles_.end());
   profiles_.insert(profiles_.end(),
       auxiliary_profiles_.begin(), auxiliary_profiles_.end());
   return profiles_;
@@ skipping 531 matching lines @@
 
   return std::string();
 }
 
 void PersonalDataManager::EnabledPrefChanged() {
   default_country_code_.clear();
   NotifyPersonalDataChanged();
 }
 
 }  // namespace autofill