Consolidate some safe-browsing histograms.

chrome/browser/safe_browsing/protocol_manager.cc

 // Copyright (c) 2010 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/protocol_manager.h"
 
 #ifndef NDEBUG
 #include "base/base64.h"
 #endif
 #include "base/environment.h"
@@ skipping 107 matching lines @@
   // The first update must happen between 1-5 minutes of start up.
   next_update_sec_ = base::RandInt(60, kSbTimerStartIntervalSec);
 
   chrome::VersionInfo version_info;
   if (!version_info.is_valid() || version_info.Version().empty())
     version_ = "0.1";
   else
     version_ = version_info.Version();
 }
 
+// static
+void SafeBrowsingProtocolManager::RecordGetHashResult(ResultType result_type) {
+  UMA_HISTOGRAM_ENUMERATION("SB2.GetHashResult", result_type,
+                            GET_HASH_RESULT_MAX);
+}
+
 SafeBrowsingProtocolManager::~SafeBrowsingProtocolManager() {
   // Delete in-progress SafeBrowsing requests.
   STLDeleteContainerPairFirstPointers(hash_requests_.begin(),
                                       hash_requests_.end());
   hash_requests_.clear();
 
   // Delete in-progress safebrowsing reports (hits and details).
   STLDeleteContainerPointers(safebrowsing_reports_.begin(),
                              safebrowsing_reports_.end());
   safebrowsing_reports_.clear();
@@ skipping 80 matching lines @@
   if (it != hash_requests_.end()) {
     // GetHash response.
     fetcher.reset(it->first);
     SafeBrowsingService::SafeBrowsingCheck* check = it->second;
     std::vector<SBFullHashResult> full_hashes;
     bool can_cache = false;
     if (response_code == 200 || response_code == 204) {
       // For tracking our GetHash false positive (204) rate, compared to real
       // (200) responses.
       if (response_code == 200)
-        UMA_HISTOGRAM_COUNTS("SB2.GetHash200", 1);
+        RecordGetHashResult(GET_HASH_STATUS_200);
       else
-        UMA_HISTOGRAM_COUNTS("SB2.GetHash204", 1);
+        RecordGetHashResult(GET_HASH_STATUS_204);
       can_cache = true;
       gethash_error_count_ = 0;
       gethash_back_off_mult_ = 1;
       bool re_key = false;
       SafeBrowsingProtocolParser parser;
       parsed_ok = parser.ParseGetHash(data.data(),
                                       static_cast<int>(data.length()),
                                       client_key_,
                                       &re_key,
                                       &full_hashes);
@@ skipping 545 matching lines @@
   if (!additional_query_.empty()) {
     if (next_url.find("?") != std::string::npos) {
       next_url.append("&");
     } else {
       next_url.append("?");
     }
     next_url.append(additional_query_);
   }
   return GURL(next_url);
 }