XS: s/malware_pattern_type/malware_threat_type

components/safe_browsing_db/v4_get_hash_protocol_manager.cc

 // Copyright 2016 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 "components/safe_browsing_db/v4_get_hash_protocol_manager.h"
 
 #include <utility>
 
 #include "base/base64url.h"
 #include "base/macros.h"
@@ skipping 101 matching lines @@
   GET_HASH_CHECK_RESULT_MAX
 };
 
 // Record a GetHash hit result.
 void RecordV4GetHashCheckResult(V4GetHashCheckResultType result_type) {
   UMA_HISTOGRAM_ENUMERATION("SafeBrowsing.V4GetHash.Check.Result", result_type,
                             GET_HASH_CHECK_RESULT_MAX);
 }
 
 const char kPermission[] = "permission";
 const char kPhaPatternType[] = "pha_pattern_type";

[Nathan Parker, 2017/01/24 00:01:32]

Huh, why is this one pha_PATTERN_type then? Maybe this was a mistake in the
original public spec.  

-const char kMalwarePatternType[] = "malware_pattern_type";
+const char kMalwareThreatType[] = "malware_threat_type";
 const char kSePatternType[] = "se_pattern_type";
 const char kLanding[] = "LANDING";
 const char kDistribution[] = "DISTRIBUTION";
 const char kSocialEngineeringAds[] = "SOCIAL_ENGINEERING_ADS";
 const char kSocialEngineeringLanding[] = "SOCIAL_ENGINEERING_LANDING";
 const char kPhishing[] = "PHISHING";
 
 }  // namespace
 
 namespace safe_browsing {
@@ skipping 446 matching lines @@
     // For API Abuse, store a list of the returned permissions.
     for (const ThreatEntryMetadata::MetadataEntry& m :
          match.threat_entry_metadata().entries()) {
       if (m.key() != kPermission) {
         RecordParseGetHashResult(UNEXPECTED_METADATA_VALUE_ERROR);
         return;
       }
       metadata->api_permissions.insert(m.value());
     }
   } else if (match.threat_type() == MALWARE_THREAT ||
              match.threat_type() == POTENTIALLY_HARMFUL_APPLICATION) {

[Nathan Parker, 2017/01/24 00:01:32]

Is this even possible?  I'm wondering if we can remove the
POTENTIALLY_HARMFUL_APPLICATION and kPhaPatternType from this file -- those are
mobile-only terms.  We do use "pha_pattern_type" when parsing metadata from
XLB/GMSCore, but that's here:

https://cs.chromium.org/chromium/src/components/safe_browsing_db/safe_browsin...

At least add a TODO

     for (const ThreatEntryMetadata::MetadataEntry& m :
          match.threat_entry_metadata().entries()) {
-      if (m.key() == kPhaPatternType || m.key() == kMalwarePatternType) {
+      if (m.key() == kPhaPatternType || m.key() == kMalwareThreatType) {
         if (m.value() == kLanding) {
           metadata->threat_pattern_type = ThreatPatternType::MALWARE_LANDING;
           break;
         } else if (m.value() == kDistribution) {
           metadata->threat_pattern_type =
               ThreatPatternType::MALWARE_DISTRIBUTION;
           break;
         } else {
           RecordParseGetHashResult(UNEXPECTED_METADATA_VALUE_ERROR);
           return;
@@ skipping 149 matching lines @@
 std::ostream& operator<<(std::ostream& os, const FullHashInfo& fhi) {
   os << "{full_hash: " << fhi.full_hash << "; list_id: " << fhi.list_id
      << "; positive_expiry: " << fhi.positive_expiry
      << "; metadata.api_permissions.size(): "
      << fhi.metadata.api_permissions.size() << "}";
   return os;
 }
 #endif
 
 }  // namespace safe_browsing