Migrate geolocation permissions to the new common permission class.

chrome/browser/content_settings/permission_context_uma_util.cc

Index: chrome/browser/content_settings/permission_context_uma_util.cc
diff --git a/chrome/browser/content_settings/permission_context_uma_util.cc b/chrome/browser/content_settings/permission_context_uma_util.cc
index 0b16be020ee05b746ed15dc06bc2e5fb998b8a63..b76d5414a384ea1f6f85f4c9749ab80a96c73341 100644
--- a/chrome/browser/content_settings/permission_context_uma_util.cc
+++ b/chrome/browser/content_settings/permission_context_uma_util.cc
@@ -28,6 +28,7 @@ enum PermissionType {
   PERMISSION_MIDI_SYSEX = 1,
   PERMISSION_PUSH_MESSAGING = 2,
   PERMISSION_NOTIFICATIONS = 3,
+  PERMISSION_GEOLOCATION = 4,
 
   // Always keep this at the end.
   PERMISSION_NUM,
@@ -37,8 +38,10 @@ void RecordPermissionAction(
       ContentSettingsType permission, PermissionAction action) {
   switch (permission) {
       case CONTENT_SETTINGS_TYPE_GEOLOCATION:
-        // TODO(miguelg): support geolocation through
-        // the generic permission class.
+        UMA_HISTOGRAM_ENUMERATION(
+                   "ContentSettings.PermissionActions_Geolocation",
+                   action,
+                   PERMISSION_ACTION_NUM);
         break;
       case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
         UMA_HISTOGRAM_ENUMERATION(
@@ -72,6 +75,9 @@ void RecordPermissionRequest(
     ContentSettingsType permission) {
   PermissionType type;
   switch (permission) {
+    case CONTENT_SETTINGS_TYPE_GEOLOCATION:
+      type = PERMISSION_GEOLOCATION;
+      break;
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
       type = PERMISSION_NOTIFICATIONS;
       break;