summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_resolver_perftest.cc
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-20 02:15:31 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-20 02:15:31 +0000
commit2357868189633f0e115648d744522b6063d2c440 (patch)
tree804b8784c016f8f03820cfd7d4deb3fdb76b0893 /net/proxy/proxy_resolver_perftest.cc
parent05769e3c62f9371a8aef06c810ac6767b410241d (diff)
downloadchromium_src-2357868189633f0e115648d744522b6063d2c440.zip
chromium_src-2357868189633f0e115648d744522b6063d2c440.tar.gz
chromium_src-2357868189633f0e115648d744522b6063d2c440.tar.bz2
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
Diffstat (limited to 'net/proxy/proxy_resolver_perftest.cc')
-rw-r--r--net/proxy/proxy_resolver_perftest.cc16
1 files changed, 9 insertions, 7 deletions
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);
}