diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-16 23:51:36 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-16 23:51:36 +0000 |
| commit | c833e32d2e3b62c24daf994ef39dd670e6852d5b (patch) | |
| tree | 4998289d48e4cf1a65e6c85f0472c855a19a8e9b /net | |
| parent | 10f6b9defe77e4f690e8608ad3e4361890869ca2 (diff) | |
| download | chromium_src-c833e32d2e3b62c24daf994ef39dd670e6852d5b.zip chromium_src-c833e32d2e3b62c24daf994ef39dd670e6852d5b.tar.gz chromium_src-c833e32d2e3b62c24daf994ef39dd670e6852d5b.tar.bz2 | |
Fix a bad merge.
The check-in r62746 clobbered the changes I made in r62689 to host_resolver_impl.cc.
I believe that was an accident since r62746 moved code within the file.
TBR=jar
Review URL: http://codereview.chromium.org/3828008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62879 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/host_resolver_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/base/host_resolver_impl.cc b/net/base/host_resolver_impl.cc index e86718b..8d84de8 100644 --- a/net/base/host_resolver_impl.cc +++ b/net/base/host_resolver_impl.cc @@ -550,7 +550,7 @@ class HostResolverImpl::Job category = RESOLVE_SPECULATIVE_FAIL; DNS_HISTOGRAM("DNS.ResolveSpeculativeFail", duration); } - UMA_HISTOGRAM_CUSTOM_ENUMERATION("Net.OSErrorsForGetAddrinfo", + UMA_HISTOGRAM_CUSTOM_ENUMERATION(kOSErrorsForGetAddrinfoHistogramName, std::abs(os_error_), GetAllGetAddrinfoOSErrors()); } |