summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_resolver_js_bindings.cc
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-14 04:54:46 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-14 04:54:46 +0000
commit684970b638fbfe1a2137fd162f630c86d2859828 (patch)
treeb74fafda6801aa5c9e8746c230b8a2880a1de585 /net/proxy/proxy_resolver_js_bindings.cc
parentc4deb899d3293782beeb8d83eefc226a5fb1813e (diff)
downloadchromium_src-684970b638fbfe1a2137fd162f630c86d2859828.zip
chromium_src-684970b638fbfe1a2137fd162f630c86d2859828.tar.gz
chromium_src-684970b638fbfe1a2137fd162f630c86d2859828.tar.bz2
LoadLog is used as an output parameter, reorder it to the last parameter.
Review URL: http://codereview.chromium.org/164531 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_resolver_js_bindings.cc')
-rw-r--r--net/proxy/proxy_resolver_js_bindings.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/proxy/proxy_resolver_js_bindings.cc b/net/proxy/proxy_resolver_js_bindings.cc
index 723c91e..94d6448 100644
--- a/net/proxy/proxy_resolver_js_bindings.cc
+++ b/net/proxy/proxy_resolver_js_bindings.cc
@@ -38,7 +38,7 @@ class SyncHostResolverBridge
// Hack for tests -- run synchronously on current thread.
if (!host_resolver_loop_)
- return host_resolver_->Resolve(NULL, info, addresses, NULL, NULL);
+ return host_resolver_->Resolve(info, addresses, NULL, NULL, NULL);
// Otherwise start an async resolve on the resolver's thread.
host_resolver_loop_->PostTask(FROM_HERE, NewRunnableMethod(this,
@@ -55,7 +55,7 @@ class SyncHostResolverBridge
net::AddressList* addresses) {
DCHECK_EQ(host_resolver_loop_, MessageLoop::current());
int error = host_resolver_->Resolve(
- NULL, info, addresses, &callback_, NULL);
+ info, addresses, &callback_, NULL, NULL);
if (error != ERR_IO_PENDING)
OnResolveCompletion(error); // Completed synchronously.
}