Making CSD ReportType enum consistent.

chrome/browser/safe_browsing/local_database_manager_unittest.cc

 // Copyright 2013 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/local_database_manager.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <string>
@@ skipping 85 matching lines @@
   LocalSafeBrowsingDatabaseManager::SafeBrowsingCheck* check_ptr = check.get();
   db_manager_->checks_[check_ptr] = std::move(check);
 
   bool result = db_manager_->HandleOneCheck(check_ptr, hash_results);
   db_manager_->checks_.erase(check_ptr);
   return result;
 }
 
 TEST_F(LocalDatabaseManagerTest, CheckCorrespondsListTypeForHash) {
   std::vector<SBThreatType> malware_threat(1,
-                                           SB_THREAT_TYPE_BINARY_MALWARE_URL);
+                                           SB_THREAT_TYPE_URL_BINARY_MALWARE);
   EXPECT_FALSE(RunSBHashTest(BINURL, malware_threat, {kMalwareList}));
   EXPECT_TRUE(RunSBHashTest(BINURL, malware_threat, {kBinUrlList}));
 
   // Check for multiple threats
   std::vector<SBThreatType> multiple_threats;
   multiple_threats.push_back(SB_THREAT_TYPE_URL_MALWARE);
   multiple_threats.push_back(SB_THREAT_TYPE_URL_PHISHING);
   EXPECT_FALSE(RunSBHashTest(MALWARE, multiple_threats, {kBinUrlList}));
   EXPECT_TRUE(RunSBHashTest(MALWARE, multiple_threats, {kMalwareList}));
 
   // Check for multiple hash hits
   std::vector<SBThreatType> unwanted_threat = {SB_THREAT_TYPE_URL_UNWANTED};
   std::vector<std::string> hash_hits = {kMalwareList, kUnwantedUrlList};
   EXPECT_TRUE(RunSBHashTest(UNWANTEDURL, unwanted_threat, hash_hits));
 }
 
 TEST_F(LocalDatabaseManagerTest, CheckCorrespondsListTypeForUrl) {
   const GURL url("http://www.host.com/index.html");
   const std::string host1 = "host.com/";
   const std::string host2 = "www.host.com/";
   const std::vector<HostListPair> malware_list_result =
       {{host1, kMalwareList}};
   const std::vector<HostListPair> binurl_list_result =
       {{host2, kBinUrlList}};
 
   std::vector<SBThreatType> malware_threat =
-      {SB_THREAT_TYPE_BINARY_MALWARE_URL};
+      {SB_THREAT_TYPE_URL_BINARY_MALWARE};
   EXPECT_FALSE(RunUrlTest(url, BINURL, malware_threat, malware_list_result));
   EXPECT_TRUE(RunUrlTest(url, BINURL, malware_threat, binurl_list_result));
 
   // Check for multiple expected threats
   std::vector<SBThreatType> multiple_threats =
       {SB_THREAT_TYPE_URL_MALWARE, SB_THREAT_TYPE_URL_PHISHING};
   EXPECT_FALSE(RunUrlTest(url, MALWARE, multiple_threats, binurl_list_result));
   EXPECT_TRUE(RunUrlTest(url, MALWARE, multiple_threats, malware_list_result));
 
   // Check for multiple database hits
@@ skipping 188 matching lines @@
   // Stop the service without first flushing above tasks.
   db_manager->StopOnIOThread(false);
 
   // Now run posted tasks, whish should include the extension check which has
   // been posted to the safe browsing task runner. This should not crash.
   content::RunAllBlockingPoolTasksUntilIdle();
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace safe_browsing