| Index: components/safe_browsing_db/v4_get_hash_protocol_manager.cc
|
| diff --git a/components/safe_browsing_db/v4_get_hash_protocol_manager.cc b/components/safe_browsing_db/v4_get_hash_protocol_manager.cc
|
| index b78a4b5fb0b94e5b4c628848db656fb446714a6e..d7fd804f046fd12edbb21454008aa444529b9a57 100644
|
| --- a/components/safe_browsing_db/v4_get_hash_protocol_manager.cc
|
| +++ b/components/safe_browsing_db/v4_get_hash_protocol_manager.cc
|
| @@ -109,9 +109,10 @@ V4GetHashProtocolManager::V4GetHashProtocolManager(
|
| }
|
|
|
| // static
|
| -void V4GetHashProtocolManager::RecordGetHashResult(ResultType result_type) {
|
| +void V4GetHashProtocolManager::RecordGetHashResult(
|
| + OperationResultType result_type) {
|
| UMA_HISTOGRAM_ENUMERATION("SafeBrowsing.GetV4HashResult", result_type,
|
| - GET_HASH_RESULT_MAX);
|
| + V4ProtocolManagerUtil::OPERATION_RESULT_TYPE_MAX);
|
| }
|
|
|
| V4GetHashProtocolManager::~V4GetHashProtocolManager() {
|
| @@ -248,9 +249,9 @@ void V4GetHashProtocolManager::GetFullHashes(
|
| // (i.e. treat the page as safe).
|
| if (Time::Now() <= next_gethash_time_) {
|
| if (gethash_error_count_) {
|
| - RecordGetHashResult(GET_HASH_BACKOFF_ERROR);
|
| + RecordGetHashResult(V4ProtocolManagerUtil::BACKOFF_ERROR);
|
| } else {
|
| - RecordGetHashResult(GET_HASH_MIN_WAIT_DURATION_ERROR);
|
| + RecordGetHashResult(V4ProtocolManagerUtil::MIN_WAIT_DURATION_ERROR);
|
| }
|
| std::vector<SBFullHashResult> full_hashes;
|
| callback.Run(full_hashes, base::TimeDelta());
|
| @@ -301,13 +302,13 @@ void V4GetHashProtocolManager::OnURLFetchComplete(
|
| std::vector<SBFullHashResult> full_hashes;
|
| base::TimeDelta negative_cache_duration;
|
| if (status.is_success() && response_code == net::HTTP_OK) {
|
| - RecordGetHashResult(GET_HASH_STATUS_200);
|
| + RecordGetHashResult(V4ProtocolManagerUtil::STATUS_200);
|
| ResetGetHashErrors();
|
| std::string data;
|
| source->GetResponseAsString(&data);
|
| if (!ParseHashResponse(data, &full_hashes, &negative_cache_duration)) {
|
| full_hashes.clear();
|
| - RecordGetHashResult(GET_HASH_PARSE_ERROR);
|
| + RecordGetHashResult(V4ProtocolManagerUtil::PARSE_ERROR);
|
| }
|
| } else {
|
| HandleGetHashError(Time::Now());
|
| @@ -317,9 +318,9 @@ void V4GetHashProtocolManager::OnURLFetchComplete(
|
| << " and response code: " << response_code;
|
|
|
| if (status.status() == net::URLRequestStatus::FAILED) {
|
| - RecordGetHashResult(GET_HASH_NETWORK_ERROR);
|
| + RecordGetHashResult(V4ProtocolManagerUtil::NETWORK_ERROR);
|
| } else {
|
| - RecordGetHashResult(GET_HASH_HTTP_ERROR);
|
| + RecordGetHashResult(V4ProtocolManagerUtil::HTTP_ERROR);
|
| }
|
| }
|
|
|
|
|