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

components/safe_browsing_db/v4_get_hash_protocol_manager_unittest.cc

Index: components/safe_browsing_db/v4_get_hash_protocol_manager_unittest.cc
diff --git a/components/safe_browsing_db/v4_get_hash_protocol_manager_unittest.cc b/components/safe_browsing_db/v4_get_hash_protocol_manager_unittest.cc
index 0bbdefb81385c798986716decd0a2f9a177e37d0..274910f2e8960f54e9d5ce890dc0be404c366926 100644
--- a/components/safe_browsing_db/v4_get_hash_protocol_manager_unittest.cc
+++ b/components/safe_browsing_db/v4_get_hash_protocol_manager_unittest.cc
@@ -80,7 +80,11 @@ class V4GetHashProtocolManagerTest : public PlatformTest {
     config.client_name = kClient;
     config.version = kAppVer;
     config.key_param = kKeyParam;
-    StoresToCheck stores_to_check({GetUrlMalwareId(), GetChromeUrlApiId()});
+    StoresToCheck stores_to_check(
+        {GetUrlMalwareId(), GetChromeUrlApiId(),
+         ListIdentifier(CHROME_PLATFORM, URL, SOCIAL_ENGINEERING_PUBLIC),
+         ListIdentifier(CHROME_PLATFORM, URL,
+                        POTENTIALLY_HARMFUL_APPLICATION)});
     return V4GetHashProtocolManager::Create(NULL, stores_to_check, config);
   }
 
@@ -285,12 +289,16 @@ TEST_F(V4GetHashProtocolManagerTest,
 TEST_F(V4GetHashProtocolManagerTest, TestGetHashRequest) {
   FindFullHashesRequest req;
   ThreatInfo* info = req.mutable_threat_info();
+  // The order of these is important.
   info->add_platform_types(GetCurrentPlatformType());
   info->add_platform_types(CHROME_PLATFORM);
 
   info->add_threat_entry_types(URL);
 
+  // The order of these is important.

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

How does the order matter?

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

The order mattered because if they are not in the same order as they are in the
request generated by product code, then the base64 encoded strings won't match.

Turns out, the order in which the unordered_set returns values varies by
platform (which isn't wrong) so I changed the code to sort incoming
platform_types, threat_entry_types, and threat_types using a set and then store
them in a vector. That makes the order predictable.

   info->add_threat_types(MALWARE_THREAT);
+  info->add_threat_types(SOCIAL_ENGINEERING_PUBLIC);
+  info->add_threat_types(POTENTIALLY_HARMFUL_APPLICATION);
   info->add_threat_types(API_ABUSE);
 
   HashPrefix one = "hashone";
@@ -331,6 +339,14 @@ TEST_F(V4GetHashProtocolManagerTest, TestParseHashResponse) {
       m->mutable_threat_entry_metadata()->add_entries();
   e->set_key("permission");
   e->set_value("NOTIFICATIONS");
+  // Add another ThreatMatch for a list we don't track. This response should
+  // get dropped.
+  m = res.add_matches();
+  m->set_threat_type(THREAT_TYPE_UNSPECIFIED);
+  m->set_platform_type(CHROME_PLATFORM);
+  m->set_threat_entry_type(URL);
+  m->mutable_cache_duration()->set_seconds(300);
+  m->mutable_threat()->set_hash(full_hash);
 
   // Serialize.
   std::string res_data;
@@ -341,6 +357,8 @@ TEST_F(V4GetHashProtocolManagerTest, TestParseHashResponse) {
   EXPECT_TRUE(pm->ParseHashResponse(res_data, &full_hash_infos, &cache_expire));
 
   EXPECT_EQ(now + base::TimeDelta::FromSeconds(600), cache_expire);
+  // Even though the server responded with two ThreatMatch responses, one
+  // should have been dropped.
   ASSERT_EQ(1ul, full_hash_infos.size());
   const FullHashInfo& fhi = full_hash_infos[0];
   EXPECT_EQ(full_hash, fhi.full_hash);