| 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 417e1fa887d6271e5b889e215efb87fa3bc5c8a8..8a14d3c23770d5fe7676f5b6ea3d19c915a2e584 100644
|
| --- a/components/safe_browsing_db/v4_get_hash_protocol_manager.cc
|
| +++ b/components/safe_browsing_db/v4_get_hash_protocol_manager.cc
|
| @@ -27,7 +27,7 @@ namespace {
|
| // Record a GetHash result.
|
| void RecordGetHashResult(safe_browsing::V4OperationResult result) {
|
| UMA_HISTOGRAM_ENUMERATION(
|
| - "SafeBrowsing.GetV4HashResult", result,
|
| + "SafeBrowsing.V4GetHash.Result", result,
|
| safe_browsing::V4OperationResult::OPERATION_RESULT_MAX);
|
| }
|
|
|
| @@ -67,7 +67,7 @@ enum ParseResultType {
|
|
|
| // Record parsing errors of a GetHash result.
|
| void RecordParseGetHashResult(ParseResultType result_type) {
|
| - UMA_HISTOGRAM_ENUMERATION("SafeBrowsing.ParseV4HashResult", result_type,
|
| + UMA_HISTOGRAM_ENUMERATION("SafeBrowsing.V4GetHash.Parse.Result", result_type,
|
| PARSE_RESULT_TYPE_MAX);
|
| }
|
|
|
| @@ -90,8 +90,8 @@ enum V4FullHashCacheResultType {
|
|
|
| // Record a full hash cache hit result.
|
| void RecordV4FullHashCacheResult(V4FullHashCacheResultType result_type) {
|
| - UMA_HISTOGRAM_ENUMERATION("SafeBrowsing.V4FullHashCacheResult", result_type,
|
| - FULL_HASH_CACHE_RESULT_MAX);
|
| + UMA_HISTOGRAM_ENUMERATION("SafeBrowsing.V4GetHash.CacheHit.Result",
|
| + result_type, FULL_HASH_CACHE_RESULT_MAX);
|
| }
|
|
|
| // Enumerate GetHash hits/misses for histogramming purposes. DO NOT CHANGE THE
|
| @@ -113,7 +113,7 @@ enum V4GetHashCheckResultType {
|
|
|
| // Record a GetHash hit result.
|
| void RecordV4GetHashCheckResult(V4GetHashCheckResultType result_type) {
|
| - UMA_HISTOGRAM_ENUMERATION("SafeBrowsing.V4GetHashCheckResult", result_type,
|
| + UMA_HISTOGRAM_ENUMERATION("SafeBrowsing.V4GetHash.Check.Result", result_type,
|
| GET_HASH_CHECK_RESULT_MAX);
|
| }
|
|
|
| @@ -131,9 +131,6 @@ const char kPhishing[] = "PHISHING";
|
|
|
| namespace safe_browsing {
|
|
|
| -const char kUmaV4HashResponseMetricName[] =
|
| - "SafeBrowsing.GetV4HashHttpResponseOrErrorCode";
|
| -
|
| // The default V4GetHashProtocolManagerFactory.
|
| class V4GetHashProtocolManagerFactoryImpl
|
| : public V4GetHashProtocolManagerFactory {
|
| @@ -696,7 +693,7 @@ void V4GetHashProtocolManager::OnURLFetchComplete(
|
| int response_code = source->GetResponseCode();
|
| net::URLRequestStatus status = source->GetStatus();
|
| V4ProtocolManagerUtil::RecordHttpResponseOrErrorCode(
|
| - kUmaV4HashResponseMetricName, status, response_code);
|
| + "SafeBrowsing.V4GetHash.Network.Result", status, response_code);
|
|
|
| std::vector<FullHashInfo> full_hash_infos;
|
| Time negative_cache_expire;
|
| @@ -724,7 +721,7 @@ void V4GetHashProtocolManager::OnURLFetchComplete(
|
| }
|
|
|
| const std::unique_ptr<FullHashCallbackInfo>& fhci = it->second;
|
| - UMA_HISTOGRAM_LONG_TIMES("SafeBrowsing.V4GetHashNetwork.Time",
|
| + UMA_HISTOGRAM_LONG_TIMES("SafeBrowsing.V4GetHash.Network.Time",
|
| clock_->Now() - fhci->network_start_time);
|
| UpdateCache(fhci->prefixes_requested, full_hash_infos, negative_cache_expire);
|
| MergeResults(fhci->full_hash_to_store_and_hash_prefixes, full_hash_infos,
|
|
|