mac: Clean up autofill integration with Address Book.

components/autofill/core/browser/autofill_external_delegate.cc

Index: components/autofill/core/browser/autofill_external_delegate.cc
diff --git a/components/autofill/core/browser/autofill_external_delegate.cc b/components/autofill/core/browser/autofill_external_delegate.cc
index c00fa8e9ec7e5b21c46b85b4650e5a65b57f7ace..acc8ea85e61fe2c8f7e47cd878cf5297c5d3cbea 100644
--- a/components/autofill/core/browser/autofill_external_delegate.cc
+++ b/components/autofill/core/browser/autofill_external_delegate.cc
@@ -5,6 +5,7 @@
 #include "components/autofill/core/browser/autofill_external_delegate.h"
 
 #include "base/message_loop/message_loop.h"
+#include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autocomplete_history_manager.h"
 #include "components/autofill/core/browser/autofill_driver.h"
@@ -98,8 +99,11 @@ void AutofillExternalDelegate::OnSuggestionsReturned(
     values.push_back(
         l10n_util::GetStringUTF16(IDS_AUTOFILL_ACCESS_MAC_CONTACTS));
     labels.push_back(base::string16());
-    icons.push_back(base::string16());
+    icons.push_back(base::ASCIIToUTF16("macContactsIcon"));
     ids.push_back(POPUP_ITEM_ID_MAC_ACCESS_CONTACTS);
+
+    base::RecordAction(base::UserMetricsAction(
+        "Autofill_Showed_Access_Mac_Address_Book_Entry"));

[Ilya Sherman, 2014/05/30 23:39:48]

Please use an enumerated histogram rather than a user action.  Also, FYI, user
action names do not typically have so many underscores in them.

[erikchen, 2014/06/02 21:21:17]

Done.

   }
 #endif
 
@@ -171,6 +175,9 @@ void AutofillExternalDelegate::DidAcceptSuggestion(const base::string16& value,
     driver_->RendererShouldFillFieldWithValue(value);
   } else if (identifier == POPUP_ITEM_ID_MAC_ACCESS_CONTACTS) {
 #if defined(OS_MACOSX)
+    base::RecordAction(base::UserMetricsAction(
+        "Autofill_Selected_Access_Mac_Address_Book_Entry"));
+
     // User wants to give Chrome access to user's address book.
     manager_->AccessAddressBook();