Migrate geolocation permissions to the new common permission class.

tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 7ddcd3fe8c5f93c1e79fcd43039e81eab4897aab..78b9b47d63c458a7b6067827afab404ce417f331 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -9341,12 +9341,20 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 
 <histogram name="Geolocation.InfoBarDelegate.Event"
     enum="GeolocationInfoBarDelegateEvent">
+  <obsolete>
+    Deprecated 9/2014, and replaced by
+    ContentSettings.PermissionActions_Geolocation.

[lgarron, 2015/04/03 23:07:24]

Should I be able to find ContentSettings.PermissionActions_Geolocation in
histograms.xml?

[Miguel Garcia, 2015/04/06 09:05:43]

Yes, look for <histogram_suffixes name="PermissionActions"> around
https://cs.corp.google.com/#clankium/src/tools/metrics/histograms/histograms....
(takes a while to load). The histogram is defined as a stem and a set of
suffixes (one per permission).

+  </obsolete>
   <owner>mvanouwerkerk@chromium.org</owner>
   <summary>Events in GeolocationInfoBarDelegate.</summary>
 </histogram>
 
 <histogram name="Geolocation.InfoBarDelegateAndroid.Event"
     enum="GeolocationInfoBarDelegateAndroidEvent">
+  <obsolete>
+    Deprecated 9/2014, and replaced by
+    ContentSettings.PermissionActions_Geolocation.
+  </obsolete>
   <owner>mvanouwerkerk@chromium.org</owner>
   <summary>Events in GeolocationInfoBarDelegateAndroid.</summary>
 </histogram>
@@ -43730,6 +43738,9 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 </enum>
 
 <enum name="GeolocationInfoBarDelegateAndroidEvent" type="int">
+  <obsolete>
+    Deprecated 9/2014, and replaced by PermissionAction.
+  </obsolete>
   <int value="0" label="User allowed the page to use geolocation">
     For the Android platform the count for this event should be exactly the same
     as the corresponding event in the GeolocationInfoBarDelegateEvent enum.
@@ -43738,6 +43749,9 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 </enum>
 
 <enum name="GeolocationInfoBarDelegateEvent" type="int">
+  <obsolete>
+    Deprecated 9/2014, and replaced by PermissionAction.
+  </obsolete>
   <int value="0" label="The bar was created"/>
   <int value="1" label="User allowed use of geolocation"/>
   <int value="2" label="User denied use of geolocation"/>
@@ -48641,6 +48655,7 @@ To add a new entry, add it with any value and run test to compute valid value.
   <int value="1" label="PERMISSION_MIDI_SYSEX"/>
   <int value="2" label="PERMISSION_PUSH_MESSAGING"/>
   <int value="3" label="PERMISSION_NOTIFICATIONS"/>
+  <int value="4" label="PERMISSION_GEOLOCATION"/>
 </enum>
 
 <enum name="PhotoEditorFileType" type="int">
@@ -55555,6 +55570,7 @@ To add a new entry, add it with any value and run test to compute valid value.
   <suffix name="MidiSysEx" label="Midi SysEx permsision actions"/>
   <suffix name="PushMessaging" label="Push messaging permission actions"/>
   <suffix name="Notifications" label="Notification permission actions"/>
+  <suffix name="Geolocation" label="Geolocation permission actions"/>
   <affected-histogram name="ContentSettings.PermissionActions"/>
 </histogram_suffixes>