Migrate geolocation permissions to the new common permission class.

chrome/browser/content_settings/permission_context_uma_util.cc

 // Copyright 2014 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 "base/metrics/histogram.h"
 #include "chrome/browser/content_settings/permission_context_uma_util.h"
 
 namespace {
 
 // Enum for UMA purposes, make sure you update histograms.xml if you add new
@@ skipping 10 matching lines @@
 };
 
 // Enum for UMA purposes, make sure you update histograms.xml if you add new
 // permission actions. Never delete or reorder an entry; only add new entries
 // immediately before PERMISSION_NUM
 enum PermissionType {
   PERMISSION_UNKNOWN = 0,
   PERMISSION_MIDI_SYSEX = 1,
   PERMISSION_PUSH_MESSAGING = 2,
   PERMISSION_NOTIFICATIONS = 3,
+  PERMISSION_GEOLOCATION = 3,

[Michael van Ouwerkerk, 2014/08/13 10:01:10]

4?

[Miguel Garcia, 2014/08/13 13:18:13]

Yep, thanks for spotting it.

 
   // Always keep this at the end.
   PERMISSION_NUM,
 };
 
 void RecordPermissionAction(
       ContentSettingsType permission, PermissionAction action) {
   switch (permission) {
       case CONTENT_SETTINGS_TYPE_GEOLOCATION:
-        // TODO(miguelg): support geolocation through
-        // the generic permission class.
-        break;
+        UMA_HISTOGRAM_ENUMERATION(
+                   "ContentSettings.PermisionActions_Geolocation",
+                   action,
+                   PERMISSION_ACTION_NUM);
+
       case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
         UMA_HISTOGRAM_ENUMERATION(
             "ContentSettings.PermisionActions_Notifications",
             action,
             PERMISSION_ACTION_NUM);
         break;
       case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
         UMA_HISTOGRAM_ENUMERATION("ContentSettings.PermisionActions_MidiSysEx",
                                   action,
                                   PERMISSION_ACTION_NUM);
@@ skipping 12 matching lines @@
 #endif
       default:
         NOTREACHED() << "PERMISSION " << permission << " not accounted for";
     }
 }
 
 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;
     case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
       type = PERMISSION_MIDI_SYSEX;
       break;
     case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
       type = PERMISSION_PUSH_MESSAGING;
       break;
     default:
@@ skipping 25 matching lines @@
 
 void PermissionContextUmaUtil::PermissionDismissed(
     ContentSettingsType permission) {
   RecordPermissionAction(permission, DISMISSED);
 }
 
 void PermissionContextUmaUtil::PermissionIgnored(
     ContentSettingsType permission) {
   RecordPermissionAction(permission, IGNORED);
 }