Separate pre-classification checks for client-side malware and phishing

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 540e482ac84d1b24d1a5c6210eb366f54ce1d12c..2909080c863be7b06c8e86f2f50b1d14680ecaa7 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -17500,6 +17500,15 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="SBClientMalware.ClassificationStart">
+  <summary>
+    The number of pages that we could have possibly classified (essentially the
+    number of top page navigations by users with SBClientMalware enabled). The
+    name is slightly misleading as it is recorded before
+    &quot;Preclassification&quot; happens.
+  </summary>
+</histogram>
+
 <histogram name="SBClientMalware.IPBlacklistRequestNetError"
     enum="NetErrorCodes">
   <summary>
@@ -17520,6 +17529,14 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="SBClientMalware.PreClassificationCheckFail"
+    enum="SBClientDetectionPreClassificationCheckFail">
+  <summary>
+    Records the number of malware classifications that were skipped because a
+    pre-classification check failed.
+  </summary>
+</histogram>
+
 <histogram name="SBClientMalware.SentReports" enum="SBClientMalwareSentReports">
   <summary>
     Measures the success rate of sending malware reports.  Sending a report can
@@ -17633,7 +17650,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="SBClientPhishing.PreClassificationCheckFail"
-    enum="SBClientPhishingPreClassificationCheckFail">
+    enum="SBClientDetectionPreClassificationCheckFail">
   <summary>
     Records the number of phishing classifications that were skipped because a
     pre-classification check failed.
@@ -31044,6 +31061,19 @@ other types of suffix sets.
   <int value="7" label="BACKUP_NETWORK_SUCCESS"/>
 </enum>
 
+<enum name="SBClientDetectionPreClassificationCheckFail" type="int">
+  <int value="0" label="PROXY_FETCH"/>
+  <int value="1" label="PRIVATE_IP"/>
+  <int value="2" label="OFF_THE_RECORD"/>
+  <int value="3" label="MATCH_CSD_WHITELIST"/>
+  <int value="4" label="TOO_MANY_REPORTS"/>
+  <int value="5" label="UNSUPPORTED_MIME_TYPE"/>
+  <int value="6" label="NO_DATABASE_MANAGER"/>
+  <int value="7" label="KILLSWITCH"/>
+  <int value="8" label="CANCEL"/>
+  <int value="9" label="RESULT_FROM_CACHE"/>
+</enum>
+
 <enum name="SBClientDownloadCheckDownloadStats" type="int">
   <int value="0" label="INVALID_URL"/>
   <int value="1" label="SB_DISABLED"/>
@@ -31123,15 +31153,6 @@ other types of suffix sets.
   <int value="7" label="MODEL_INVALID_VERSION_NUMBER"/>
 </enum>
 
-<enum name="SBClientPhishingPreClassificationCheckFail" type="int">
-  <int value="0" label="PROXY_FETCH"/>
-  <int value="1" label="PRIVATE_IP"/>
-  <int value="2" label="OFF_THE_RECORD"/>
-  <int value="3" label="MATCH_CSD_WHITELIST"/>
-  <int value="4" label="TOO_MANY_REPORTS"/>
-  <int value="5" label="UNSUPPORTED_MIME_TYPE"/>
-</enum>
-
 <enum name="SBClientPhishingScorerCreationStatus" type="int">
   <int value="0" label="SUCCESS"/>
   <int value="1" label="MODEL_OPEN_FAIL"/>