summaryrefslogtreecommitdiffstats
path: root/net/base/single_request_host_resolver.cc
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-01 20:38:10 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-01 20:38:10 +0000
commitf1f3f0f8af3740ec2afaebcaed410950a9cc0ac8 (patch)
tree6ccdd87ccfc89adbcb372c517559fa61fbc6c6b2 /net/base/single_request_host_resolver.cc
parentd1666539b57bf8552e203d355fd09909d36f9732 (diff)
downloadchromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.zip
chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.tar.gz
chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.tar.bz2
Begin CompletionCallback switchover.
Rename CompletionCallback to OldCompletionCallback in preparation for introducing a new CompletionCallback based on base::Callback. Also renames other CompletionCallback types like CancelableCompletionCallback and TestCompletionCallback and CompletionCallbackImpl. All using sed with s/CompletionCallback/OldCompletionCallback/g. BUG=98719 TEST=none Review URL: http://codereview.chromium.org/8070013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/single_request_host_resolver.cc')
-rw-r--r--net/base/single_request_host_resolver.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/base/single_request_host_resolver.cc b/net/base/single_request_host_resolver.cc
index ced4801..5af3dd5 100644
--- a/net/base/single_request_host_resolver.cc
+++ b/net/base/single_request_host_resolver.cc
@@ -25,7 +25,7 @@ SingleRequestHostResolver::~SingleRequestHostResolver() {
int SingleRequestHostResolver::Resolve(const HostResolver::RequestInfo& info,
AddressList* addresses,
- CompletionCallback* callback,
+ OldCompletionCallback* callback,
const BoundNetLog& net_log) {
DCHECK(addresses);
DCHECK(callback);
@@ -35,7 +35,7 @@ int SingleRequestHostResolver::Resolve(const HostResolver::RequestInfo& info,
// We need to be notified of completion before |callback| is called, so that
// we can clear out |cur_request_*|.
- CompletionCallback* transient_callback = callback ? &callback_ : NULL;
+ OldCompletionCallback* transient_callback = callback ? &callback_ : NULL;
int rv = resolver_->Resolve(
info, addresses, transient_callback, &request, net_log);
@@ -61,7 +61,7 @@ void SingleRequestHostResolver::Cancel() {
void SingleRequestHostResolver::OnResolveCompletion(int result) {
DCHECK(cur_request_ && cur_request_callback_);
- CompletionCallback* callback = cur_request_callback_;
+ OldCompletionCallback* callback = cur_request_callback_;
// Clear the outstanding request information.
cur_request_ = NULL;