Making CSD ReportType enum consistent.

components/safe_browsing/base_ping_manager.cc

 // Copyright (c) 2017 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/base_ping_manager.h"
 
 #include <utility>
 
 #include "base/base64.h"
 #include "base/logging.h"
@@ skipping 181 matching lines @@
 
   fetcher->Start();
   safebrowsing_reports_.insert(std::move(fetcher));
 }
 
 GURL BasePingManager::SafeBrowsingHitUrl(
     const safe_browsing::HitReport& hit_report) const {
   DCHECK(hit_report.threat_type == SB_THREAT_TYPE_URL_MALWARE ||
          hit_report.threat_type == SB_THREAT_TYPE_URL_PHISHING ||
          hit_report.threat_type == SB_THREAT_TYPE_URL_UNWANTED ||
-         hit_report.threat_type == SB_THREAT_TYPE_BINARY_MALWARE_URL ||
-         hit_report.threat_type == SB_THREAT_TYPE_CLIENT_SIDE_PHISHING_URL ||
-         hit_report.threat_type == SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL ||
+         hit_report.threat_type == SB_THREAT_TYPE_URL_BINARY_MALWARE ||
+         hit_report.threat_type == SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING ||
+         hit_report.threat_type == SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE ||
          hit_report.threat_type ==
-             SB_THREAT_TYPE_PASSWORD_PROTECTION_PHISHING_URL);
+             SB_THREAT_TYPE_URL_PASSWORD_PROTECTION_PHISHING);
   std::string url = ProtocolManagerHelper::ComposeUrl(
       url_prefix_, "report", client_name_, version_, std::string(),
       hit_report.extended_reporting_level);
 
   std::string threat_list = "none";
   switch (hit_report.threat_type) {
     case SB_THREAT_TYPE_URL_MALWARE:
       threat_list = "malblhit";
       break;
     case SB_THREAT_TYPE_URL_PHISHING:
       threat_list = "phishblhit";
       break;
     case SB_THREAT_TYPE_URL_UNWANTED:
       threat_list = "uwsblhit";
       break;
-    case SB_THREAT_TYPE_BINARY_MALWARE_URL:
+    case SB_THREAT_TYPE_URL_BINARY_MALWARE:
       threat_list = "binurlhit";
       break;
-    case SB_THREAT_TYPE_CLIENT_SIDE_PHISHING_URL:
+    case SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING:
       threat_list = "phishcsdhit";
       break;
-    case SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL:
+    case SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE:
       threat_list = "malcsdhit";
       break;
-    case SB_THREAT_TYPE_PASSWORD_PROTECTION_PHISHING_URL:
+    case SB_THREAT_TYPE_URL_PASSWORD_PROTECTION_PHISHING:
       threat_list = "phishpphit";
       break;
     default:
       NOTREACHED();
   }
 
   std::string threat_source = "none";
   switch (hit_report.threat_source) {
     case safe_browsing::ThreatSource::DATA_SAVER:
       threat_source = "ds";
@@ skipping 48 matching lines @@
       url_prefix_.c_str(), client_name_.c_str(), version_.c_str());
   std::string api_key = google_apis::GetAPIKey();
   if (!api_key.empty()) {
     base::StringAppendF(&url, "&key=%s",
                         net::EscapeQueryParamValue(api_key, true).c_str());
   }
   return GURL(url);
 }
 
 }  // namespace safe_browsing