Recording in UMA when a user interacted with an address form or a credit card form.

components/autofill/core/browser/personal_data_manager.cc

Index: components/autofill/core/browser/personal_data_manager.cc
diff --git a/components/autofill/core/browser/personal_data_manager.cc b/components/autofill/core/browser/personal_data_manager.cc
index 911d07b047e83d2ac6d69f1d03bf8669db355f20..56287f1d16be4e1cc5e00d9580641b64a5225952 100644
--- a/components/autofill/core/browser/personal_data_manager.cc
+++ b/components/autofill/core/browser/personal_data_manager.cc
@@ -1196,22 +1196,26 @@ void PersonalDataManager::EnabledPrefChanged() {
 
 const std::vector<AutofillProfile*>& PersonalDataManager::GetProfiles(
     bool record_metrics) const {
+  bool use_auxiliary_profiles =

[Evan Stade, 2015/02/03 01:51:36]

this kind of ifdef splicing confuses a lot of syntax highlighters --- please
just copy this one line twice.

[Walter Cacau, 2015/02/03 02:15:25]

Done.

 #if defined(OS_MACOSX) && !defined(OS_IOS)
-  if (!pref_service_->GetBoolean(prefs::kAutofillUseMacAddressBook))
-    return web_profiles();
+      pref_service_->GetBoolean(prefs::kAutofillUseMacAddressBook);
 #else
-  if (!pref_service_->GetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled))
-    return web_profiles();
+      pref_service_->GetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled);
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 
   profiles_.clear();
 
   // Populates |auxiliary_profiles_|.
-  LoadAuxiliaryProfiles(record_metrics);
+  if (use_auxiliary_profiles) {

[Evan Stade, 2015/02/03 01:51:36]

no curlies

[Walter Cacau, 2015/02/03 02:15:25]

Done.

+    LoadAuxiliaryProfiles(record_metrics);
+  }
 
   profiles_.insert(profiles_.end(), web_profiles_.begin(), web_profiles_.end());
-  profiles_.insert(
-      profiles_.end(), auxiliary_profiles_.begin(), auxiliary_profiles_.end());
+  if (use_auxiliary_profiles) {
+    profiles_.insert(
+        profiles_.end(), auxiliary_profiles_.begin(),
+        auxiliary_profiles_.end());
+  }
   profiles_.insert(
       profiles_.end(), server_profiles_.begin(), server_profiles_.end());
   return profiles_;