Add UMA actions and histogram for the NPAPI InfoBar.

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 ef1870e17004a7b5e1289e34e3b0539f0ed112f2..5e6459fca6d1872c2c0a3261794f3076fabf4664 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -25046,6 +25046,25 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="NPAPIRemovalInfobar.Removed.PluginGroup" enum="PluginGroup">

[Alexei Svitkine (slow), 2015/05/12 17:38:15]

Nit: Can you use an existing prefix instead of adding a new one? e.g. Plugin.*

[Will Harris, 2015/05/12 18:25:48]

Done.

+  <owner>wfh@chromium.org</owner>
+  <summary>
+    The plugin group of an NPAPI plugin that is no longer supported. Recorded
+    when the NPAPI removal infobar is shown for a plugin which is no longer
+    supported.
+  </summary>
+</histogram>
+
+<histogram name="NPAPIRemovalInfobar.RemovedSoon.PluginGroup"
+    enum="PluginGroup">
+  <owner>wfh@chromium.org</owner>
+  <summary>
+    The plugin group of an NPAPI plugin that will be unsupported soon. Recorded
+    when the NPAPI removal infobar is shown after an NPAPI plugin first loads to
+    warn the user that NPAPI support for this plugin will be removed soon.
+  </summary>
+</histogram>
+
 <histogram name="ntp.searchurls.total">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>TBD</summary>
@@ -59948,6 +59967,19 @@ To add a new entry, add it with any value and run test to compute valid value.
   <int value="2" label="PLUGIN_DISABLED"/>
 </enum>
 
+<enum name="PluginGroup" type="int">
+  <int value="0" label="GROUP_NAME_ADOBE_READER">Adobe Reader</int>

[Alexei Svitkine (slow), 2015/05/12 17:38:15]

Nit: I would just put the human readable names in the label="" key and not
include the enum names.

[Will Harris, 2015/05/12 18:25:48]

Done.

+  <int value="1" label="GROUP_NAME_JAVA">Java</int>
+  <int value="2" label="GROUP_NAME_QUICKTIME">Quicktime</int>
+  <int value="3" label="GROUP_NAME_SHOCKWAVE">Shockwave</int>
+  <int value="4" label="GROUP_NAME_REALPLAYER">Real Player</int>
+  <int value="5" label="GROUP_NAME_SILVERLIGHT">Silverlight</int>
+  <int value="6" label="GROUP_NAME_WINDOWS_MEDIA_PLAYER">
+    Windows Media Player
+  </int>
+  <int value="7" label="GROUP_NAME_UNKNOWN">Other plugin</int>
+</enum>
+
 <enum name="PluginListError" type="int">
   <int value="0" label="NoError"/>
   <int value="1" label="JsonInvalidEscape"/>