Merge M43: 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 e1b984ff144fbc0bd1d83cfb528f69d7f09b5063..4171fb2fd7d1e37cbdac1c9838abc5cdb3dec129 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -28022,6 +28022,26 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <summary>Collects Flash usage data.</summary>
 </histogram>
 
+<histogram name="Plugin.NPAPIRemovalInfobar.Removed.PluginGroup"
+    enum="PluginGroup">
+  <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="Plugin.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="Plugin.NPAPIStatus" enum="NPAPIPluginStatus">
   <owner>wfh@chromium.org</owner>
   <summary>
@@ -57765,6 +57785,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="Other Plugin"/>
+  <int value="1" label="Adobe Reader"/>
+  <int value="2" label="Java"/>
+  <int value="3" label="Quicktime"/>
+  <int value="4" label="Shockwave"/>
+  <int value="5" label="Real Player"/>
+  <int value="6" label="Silverlight"/>
+  <int value="7" label="Windows Media Player"/>
+  <int value="8" label="Google Talk"/>
+  <int value="9" label="Google Earth"/>
+</enum>
+
 <enum name="PluginLoadResult" type="int">
   <int value="0" label="LOAD_SUCCESS"/>
   <int value="1" label="LOAD_FAILED"/>