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 defined(OS_MACOSX) && !defined(OS_IOS)
+  if (!pref_service_->GetBoolean(prefs::kAutofillUseMacAddressBook)) {
+    return web_profiles();
+  }

[Ilya Sherman, 2014/06/02 22:54:27]

nit: No need for curly braces; ditto below.

[erikchen, 2014/06/03 01:34:19]

Done.

+#else
   if (!pref_service_->GetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled)) {
     return web_profiles();
   }
+#endif

[Ilya Sherman, 2014/06/02 22:54:27]

nit: "// defined(OS_MACOSX) && !defined(OS_IOS)"

[erikchen, 2014/06/03 01:34:19]

I've added the comment. As far as I can know, the trailing comment is optional,
and there are other instances in this CL where an "#endif" does not have a
trailing comment. Let me know if you want me to change all instances of #endif
not having a trailing comment.

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

I think the trailing comment is strongly recommended except for header includes
and forward declarations -- it's basically making up for the lack of curly
braces to indicate scope.  So, please do go through and add trailing comments
for all of the #endif's.

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

I've added trailing comments to all #endif's contained in the .diff file for
this CL, except for code unrelated to autofill.

 
   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