From 2357868189633f0e115648d744522b6063d2c440 Mon Sep 17 00:00:00 2001 From: "jhawkins@chromium.org" Date: Tue, 20 Dec 2011 02:15:31 +0000 Subject: base::Bind: Convert net/proxy. BUG=none TEST=none R=csilv Review URL: http://codereview.chromium.org/8985012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115068 0039d316-1c4b-4281-b951-d872f2087c98 --- net/proxy/proxy_resolver_perftest.cc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'net/proxy/proxy_resolver_perftest.cc') diff --git a/net/proxy/proxy_resolver_perftest.cc b/net/proxy/proxy_resolver_perftest.cc index 97dfe5c..6a88500 100644 --- a/net/proxy/proxy_resolver_perftest.cc +++ b/net/proxy/proxy_resolver_perftest.cc @@ -119,7 +119,8 @@ class PacPerfSuiteRunner { GURL pac_url = test_server_.GetURL(std::string("files/") + script_name); int rv = resolver_->SetPacScript( - net::ProxyResolverScriptData::FromURL(pac_url), NULL); + net::ProxyResolverScriptData::FromURL(pac_url), + net::CompletionCallback()); EXPECT_EQ(net::OK, rv); } else { LoadPacScriptIntoResolver(script_name); @@ -131,8 +132,8 @@ class PacPerfSuiteRunner { { net::ProxyInfo proxy_info; int result = resolver_->GetProxyForURL( - GURL("http://www.warmup.com"), &proxy_info, NULL, NULL, - net::BoundNetLog()); + GURL("http://www.warmup.com"), &proxy_info, net::CompletionCallback(), + NULL, net::BoundNetLog()); ASSERT_EQ(net::OK, result); } @@ -146,9 +147,9 @@ class PacPerfSuiteRunner { // Resolve. net::ProxyInfo proxy_info; - int result = resolver_->GetProxyForURL(GURL(query.query_url), - &proxy_info, NULL, NULL, - net::BoundNetLog()); + int result = resolver_->GetProxyForURL( + GURL(query.query_url), &proxy_info, net::CompletionCallback(), NULL, + net::BoundNetLog()); // Check that the result was correct. Note that ToPacString() and // ASSERT_EQ() are fast, so they won't skew the results. @@ -179,7 +180,8 @@ class PacPerfSuiteRunner { // Load the PAC script into the ProxyResolver. int rv = resolver_->SetPacScript( - net::ProxyResolverScriptData::FromUTF8(file_contents), NULL); + net::ProxyResolverScriptData::FromUTF8(file_contents), + net::CompletionCallback()); EXPECT_EQ(net::OK, rv); } -- cgit v1.1