Update Expiration for NaCl histograms

In accordance with current deprecation schedule.

Bug: 1149472
Bug: 1149473
Bug: 1149474
Bug: 1149475
Bug: 1149476
Bug: 1149477
Bug: 1149478
Bug: 1149479
Bug: 1149480
Bug: 1149481
Bug: 1149482
Bug: 1149483
Bug: 1149484
Bug: 1149485
Change-Id: I2a33c92b31613dfe18822715c1363108737e814b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2542731Reviewed-by: Jesse Doherty <jwd@chromium.org>
Reviewed-by: Anthony LaForge <laforge@chromium.org>
Commit-Queue: Derek Schuff <dschuff@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828308}

tools/metrics/histograms/histograms_xml/na_cl/histograms.xml

@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="NaCl.AppType" enum="NaClAppTypeEnum"
-    expires_after="2021-04-25">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -33,7 +33,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Client.Helper.InitState" enum="NaClHelperStatus"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -43,7 +43,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Client.Helper.StateOnFork" enum="NaClHelperStatus"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -54,7 +54,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Client.OSArch" enum="NaClOSArchEnum"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -62,7 +62,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.HttpStatusCodeClass.Manifest.InstalledApp"
-    enum="NaClHttpStatusCodeClass" expires_after="2020-12-31">
+    enum="NaClHttpStatusCodeClass" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -73,7 +73,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.HttpStatusCodeClass.Manifest.NotInstalledApp"
-    enum="NaClHttpStatusCodeClass" expires_after="2020-12-31">
+    enum="NaClHttpStatusCodeClass" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -84,7 +84,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.HttpStatusCodeClass.Nexe.InstalledApp"
-    enum="NaClHttpStatusCodeClass" expires_after="2020-12-31">
+    enum="NaClHttpStatusCodeClass" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -95,7 +95,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.HttpStatusCodeClass.Nexe.NotInstalledApp"
-    enum="NaClHttpStatusCodeClass" expires_after="2020-12-31">
+    enum="NaClHttpStatusCodeClass" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -106,7 +106,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.LoadStatus.Plugin" enum="NaClPluginErrorCode"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -114,7 +114,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.LoadStatus.Plugin.InstalledApp"
-    enum="NaClPluginErrorCode" expires_after="2020-12-31">
+    enum="NaClPluginErrorCode" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -125,7 +125,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.LoadStatus.Plugin.NotInstalledApp"
-    enum="NaClPluginErrorCode" expires_after="2020-12-31">
+    enum="NaClPluginErrorCode" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -136,7 +136,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.LoadStatus.SelLdr" enum="NaClSelLdrErrorCode"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -144,7 +144,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.LoadStatus.SelLdr.InstalledApp"
-    enum="NaClSelLdrErrorCode" expires_after="2020-12-31">
+    enum="NaClSelLdrErrorCode" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -154,7 +154,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.LoadStatus.SelLdr.NotInstalledApp"
-    enum="NaClSelLdrErrorCode" expires_after="2020-12-31">
+    enum="NaClSelLdrErrorCode" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -164,7 +164,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Manifest.IsDataURI" enum="NaClManifestType"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -173,7 +173,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="NaCl.ModuleUptime.Crash" units="ms" expires_after="2020-12-31">
+<histogram name="NaCl.ModuleUptime.Crash" units="ms" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -181,7 +181,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.ModuleUptime.Normal" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -189,7 +189,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Options.PNaCl.OptLevel" enum="PNaClOptionsOptLevelEnum"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -200,7 +200,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClCache.IsHit" enum="PNaClTranslationCacheEnum"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -211,7 +211,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClLoadTime.CompileKBPerSec" units="KB/s"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -222,7 +222,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClLoadTime.CompileTime" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -233,7 +233,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClLoadTime.LinkTime" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -244,7 +244,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClLoadTime.LoadCompiler" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -254,7 +254,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClLoadTime.LoadLinker" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -264,7 +264,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClLoadTime.PctCompiledWhenFullyDownloaded"
-    units="%" expires_after="2020-12-31">
+    units="%" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -276,7 +276,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClLoadTime.TotalUncachedKBPerSec" units="KB/s"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -288,7 +288,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClLoadTime.TotalUncachedTime" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -299,21 +299,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.ShutdownTime.Total" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
   <summary>The time it took the NaCl module to shut down.</summary>
 </histogram>
 
-<histogram name="NaCl.Perf.Size.Manifest" units="KB" expires_after="2020-12-31">
+<histogram name="NaCl.Perf.Size.Manifest" units="KB" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
   <summary>The size of the manifest file.</summary>
 </histogram>
 
-<histogram name="NaCl.Perf.Size.Nexe" units="KB" expires_after="2020-12-31">
+<histogram name="NaCl.Perf.Size.Nexe" units="KB" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -322,7 +322,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="NaCl.Perf.Size.Pexe" units="KB" expires_after="2020-12-31">
+<histogram name="NaCl.Perf.Size.Pexe" units="KB" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -333,7 +333,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.Size.PexeNexeSizePct" units="%"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -344,7 +344,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.Size.PNaClTranslatedNexe" units="KB"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -356,7 +356,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.LoadModule" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -364,7 +364,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.LoadModulePerMB" units="milliseconds/MB"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -375,7 +375,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.ManifestDownload" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -385,7 +385,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.NaClOverhead" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -397,7 +397,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.NaClOverheadPerMB"
-    units="milliseconds/MB" expires_after="2020-12-31">
+    units="milliseconds/MB" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -410,7 +410,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.NexeDownload" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -420,7 +420,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.NexeDownloadPerMB"
-    units="milliseconds/MB" expires_after="2020-12-31">
+    units="milliseconds/MB" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -431,7 +431,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.Total" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -442,7 +442,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.TotalPerMB" units="milliseconds/MB"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -454,7 +454,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.ValidationCache.Query" enum="NaClValidationCacheEnum"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -464,7 +464,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.ValidationCache.Set" enum="NaClValidationCacheEnum"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>