Extend metrics for FileTypeUpdate

Since there are two kinds of FileTypePolicy (from Component
Updater and a local resource bundle), these histograms are
useful in identifying when we update one but not the other.

Change-Id: I371e4c6ce5b8b23f482eb7a5cce1db67355d072c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2469444Reviewed-by: Mark Pearson <mpearson@chromium.org>
Commit-Queue: Daniel Rubery <drubery@chromium.org>
Cr-Commit-Position: refs/heads/master@{#817191}

tools/metrics/histograms/histograms_xml/safe_browsing/histograms.xml

@@ -617,7 +617,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.FileTypeUpdate.DynamicUpdateResult"
-    enum="SBFileTypeUpdateResult" expires_after="M86">
+    enum="SBFileTypeUpdateResult" expires_after="2021-04-13">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -631,7 +631,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.FileTypeUpdate.DynamicUpdateVersion"
-    units="FileTypePolicies Version" expires_after="M86">
+    units="FileTypePolicies Version" expires_after="2021-04-13">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -645,7 +645,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.FileTypeUpdate.ResourceBundleResult"
-    enum="SBFileTypeUpdateResult" expires_after="M86">
+    enum="SBFileTypeUpdateResult" expires_after="2021-04-13">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -658,7 +658,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.FileTypeUpdate.ResourceBundleVersion"
-    units="FileTypePolicies Version" expires_after="M86">
+    units="FileTypePolicies Version" expires_after="2021-04-13">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>