summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-03 22:02:42 +0000
committerjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-03 22:02:42 +0000
commit95c97199c4406036b216d74e4ba3a5c57c0081a2 (patch)
tree9d7e35ec75fe7d37c36c66bc4cebf510cde28eb8
parent0be760d001ecbc6d0e2d1b0e350560144b64439b (diff)
downloadchromium_src-95c97199c4406036b216d74e4ba3a5c57c0081a2.zip
chromium_src-95c97199c4406036b216d74e4ba3a5c57c0081a2.tar.gz
chromium_src-95c97199c4406036b216d74e4ba3a5c57c0081a2.tar.bz2
Remove unused histogram that races in single process mode
Single process can race to run the static initializer, and this change gets rid of the histograms which are now unused (and only used for a fallback in single process mode). r=eroman Review URL: http://codereview.chromium.org/5630001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68220 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--net/proxy/proxy_resolver_winhttp.cc21
1 files changed, 2 insertions, 19 deletions
diff --git a/net/proxy/proxy_resolver_winhttp.cc b/net/proxy/proxy_resolver_winhttp.cc
index 962271f..6fd057d 100644
--- a/net/proxy/proxy_resolver_winhttp.cc
+++ b/net/proxy/proxy_resolver_winhttp.cc
@@ -21,23 +21,6 @@ using base::TimeTicks;
namespace net {
-// A small wrapper for histogramming purposes ;-)
-static BOOL CallWinHttpGetProxyForUrl(HINTERNET session, LPCWSTR url,
- WINHTTP_AUTOPROXY_OPTIONS* options,
- WINHTTP_PROXY_INFO* results) {
- TimeTicks time_start = TimeTicks::Now();
- BOOL rv = WinHttpGetProxyForUrl(session, url, options, results);
- TimeDelta time_delta = TimeTicks::Now() - time_start;
- // Record separately success and failure times since they will have very
- // different characteristics.
- if (rv) {
- UMA_HISTOGRAM_LONG_TIMES("Net.GetProxyForUrl_OK", time_delta);
- } else {
- UMA_HISTOGRAM_LONG_TIMES("Net.GetProxyForUrl_FAIL", time_delta);
- }
- return rv;
-}
-
static void FreeInfo(WINHTTP_PROXY_INFO* info) {
if (info->lpszProxy)
GlobalFree(info->lpszProxy);
@@ -82,12 +65,12 @@ int ProxyResolverWinHttp::GetProxyForURL(const GURL& query_url,
// Otherwise, we fail over to trying it with a value of true. This way we
// get good performance in the case where WinHTTP uses an out-of-process
// resolver. This is important for Vista and Win2k3.
- BOOL ok = CallWinHttpGetProxyForUrl(
+ BOOL ok = WinHttpGetProxyForUrl(
session_handle_, ASCIIToWide(query_url.spec()).c_str(), &options, &info);
if (!ok) {
if (ERROR_WINHTTP_LOGIN_FAILURE == GetLastError()) {
options.fAutoLogonIfChallenged = TRUE;
- ok = CallWinHttpGetProxyForUrl(
+ ok = WinHttpGetProxyForUrl(
session_handle_, ASCIIToWide(query_url.spec()).c_str(),
&options, &info);
}