SafeBrowsing UMA: Adds an inconsistent threat type histogram bucket.

chrome/browser/safe_browsing/protocol_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/safe_browsing/protocol_manager.h"
 
 #include <utility>
 
 #include "base/base64.h"
 #include "base/environment.h"
@@ skipping 72 matching lines @@
 
   // A match in the response had an unexpected THREAT_ENTRY_TYPE.
   UNEXPECTED_THREAT_ENTRY_TYPE_ERROR = 1,
 
   // A match in the response had an unexpected THREAT_TYPE.
   UNEXPECTED_THREAT_TYPE_ERROR = 2,
 
   // A match in the response had an unexpected PLATFORM_TYPE.
   UNEXPECTED_PLATFORM_TYPE_ERROR = 3,
 
-  // A match in teh response contained no metadata where metadata was
+  // A match in the response contained no metadata where metadata was
   // expected.
   NO_METADATA_ERROR = 4,
 
+  // A match in the response contained a ThreatType that was inconsistent
+  // with the other matches.
+  INCONSISTENT_THREAT_TYPE_ERROR = 5,
+
   // Memory space for histograms is determined by the max.  ALWAYS
   // ADD NEW VALUES BEFORE THIS ONE.
-  PARSE_GET_HASH_RESULT_MAX = 5
+  PARSE_GET_HASH_RESULT_MAX = 6
 };
 
 // Record parsing errors of a GetHash result.
 void RecordParseGetHashResult(ParseResultType result_type) {
   UMA_HISTOGRAM_ENUMERATION("SafeBrowsing.ParseV4HashResult", result_type,
                             PARSE_GET_HASH_RESULT_MAX);
 }
 
 }  // namespace
 
@@ skipping 258 matching lines @@
   for (const ThreatMatch& match : response.matches()) {
     // Make sure the platform and threat entry type match.
     if (!(match.has_threat_entry_type() &&
           match.threat_entry_type() == URL_EXPRESSION &&
           match.has_threat())) {
       RecordParseGetHashResult(UNEXPECTED_THREAT_ENTRY_TYPE_ERROR);
       return false;
     }
 
     if (!match.has_threat_type()) {
-      // TODO(kcarattini): Add UMA.
+      RecordParseGetHashResult(UNEXPECTED_THREAT_TYPE_ERROR);
       return false;
     }
 
     if (expected_threat_type == THREAT_TYPE_UNSPECIFIED) {
       expected_threat_type = match.threat_type();
     } else if (match.threat_type() != expected_threat_type) {
-      // TODO(kcarattini): Add UMA.
+      RecordParseGetHashResult(INCONSISTENT_THREAT_TYPE_ERROR);
       return false;
     }
 
     // Fill in the full hash.
     SBFullHashResult result;
     result.hash = StringToSBFullHash(match.threat().hash());
 
     if (match.has_cache_duration()) {
       // Seconds resolution is good enough so we ignore the nanos field.
       result.cache_duration = base::TimeDelta::FromSeconds(
           match.cache_duration().seconds());
     }
 
     // Different threat types will handle the metadata differently.
-    if (match.has_threat_type() && match.threat_type() == API_ABUSE) {
+    if (match.threat_type() == API_ABUSE) {
       if (match.has_platform_type() &&
           match.platform_type() == CHROME_PLATFORM) {
         if (match.has_threat_entry_metadata()) {
           // For API Abuse, store a csv of the returned permissions.
           for (const ThreatEntryMetadata::MetadataEntry& m :
                    match.threat_entry_metadata().entries()) {
             if (m.key() == "permission") {
               result.metadata += m.value() + ",";
             }
           }
@@ skipping 683 matching lines @@
 SafeBrowsingProtocolManager::FullHashDetails::FullHashDetails(
     FullHashCallback callback,
     bool is_download)
     : callback(callback), is_download(is_download) {}
 
 SafeBrowsingProtocolManager::FullHashDetails::~FullHashDetails() {}
 
 SafeBrowsingProtocolManagerDelegate::~SafeBrowsingProtocolManagerDelegate() {}
 
 }  // namespace safe_browsing