Ignore ThreatMatch responses for lists that we don't care about.

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 509 matching lines @@
     }
     if (!match.has_threat_type()) {
       RecordParseGetHashResult(UNEXPECTED_THREAT_TYPE_ERROR);
       return false;
     }
     if (!match.has_threat()) {
       RecordParseGetHashResult(NO_THREAT_ERROR);
       return false;
     }
 
-    ListIdentifier list_id(match.platform_type(), match.threat_entry_type(),
-                           match.threat_type());
+    const PlatformType& platform_type = match.platform_type();

[Nathan Parker, 2016/11/08 23:50:11]

Nit: these temporaries add a lot more chars then they save and don't improve to
readability.  How about:

ListIdentifier list_id(platform_type, threat_entry_type, threat_type);

if (!ContainsValue(platform_types, list_id.platform_type()) |\
    .. threat_entry_types_.. ||
    .. threat_type_..) 

[vakh (use Gerrit instead), 2016/11/10 01:05:55]

Done.

+    const ThreatEntryType& threat_entry_type = match.threat_entry_type();
+    const ThreatType& threat_type = match.threat_type();
+    if (platform_types_.find(platform_type) == platform_types_.end() ||
+        threat_entry_types_.find(threat_entry_type) ==
+            threat_entry_types_.end() ||
+        threat_types_.find(threat_type) == threat_types_.end()) {
+      // The server may send a ThreatMatch response for lists that we didn't ask
+      // for so ignore those ThreatMatch responses.
+      continue;
+    }
+
+    ListIdentifier list_id(platform_type, threat_entry_type, threat_type);
     base::Time positive_expiry;
     if (match.has_cache_duration()) {
       // Seconds resolution is good enough so we ignore the nanos field.
       positive_expiry = clock_->Now() + TimeDelta::FromSeconds(
                                             match.cache_duration().seconds());
     } else {
       positive_expiry = clock_->Now() - base::TimeDelta::FromSeconds(1);
     }
     FullHashInfo full_hash_info(match.threat().hash(), list_id,
                                 positive_expiry);
@@ skipping 194 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