Merge 249114 "PPB_Flash.Navigate(): Disallow certain HTTP reques..."

tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
===================================================================
--- tools/metrics/histograms/histograms.xml	(revision 253297)
+++ tools/metrics/histograms/histograms.xml	(working copy)
@@ -13976,6 +13976,10 @@
   </summary>
 </histogram>
 
+<histogram name="Plugin.FlashNavigateUsage" enum="FlashNavigateUsageType">
+  <summary>Record usage of PPB_Flash.Navigate() Pepper API.</summary>
+</histogram>
+
 <histogram name="Plugin.PpapiBrokerLoadResult" enum="PluginLoadResult">
   <summary>The result from an attempt to load a PPAPI broker.</summary>
 </histogram>
@@ -25227,6 +25231,26 @@
   <int value="20" label=".log"/>
 </enum>
 
+<enum name="FlashNavigateUsageType" type="int">
+  <int value="0" label="Rejected because of Authorization header."/>
+  <int value="1" label="Rejected because of Cache-Control header."/>
+  <int value="2" label="Rejected because of Content-Encoding header."/>
+  <int value="3" label="Rejected because of Content-MD5 header."/>
+  <int value="4" label="Rejected because of Content-Type header."/>
+  <int value="5" label="Rejected because of Expires header."/>
+  <int value="6" label="Rejected because of From header."/>
+  <int value="7" label="Rejected because of If-Match header."/>
+  <int value="8" label="Rejected because of If-None-Match header."/>
+  <int value="9" label="Rejected because of If-Range header."/>
+  <int value="10" label="Rejected because of If-Unmodified-Since header."/>
+  <int value="11" label="Rejected because of Pragma header."/>
+  <int value="12" label="Rejected because of Referer header."/>
+  <int value="13"
+      label="Rejected because of other headers (e.g., custom headers)."/>
+  <int value="14" label="The total number of rejected navigate requests."/>
+  <int value="15" label="The total number of navigate requests."/>
+</enum>
+
 <enum name="FtpDataConnectionError" type="int">
   <int value="0">Data connection successful</int>
   <int value="1">Local firewall blocked the connection</int>