summaryrefslogtreecommitdiffstats
path: root/net/dns/async_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/dns/async_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/dns/async_host_resolver.cc')
-rw-r--r--net/dns/async_host_resolver.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/dns/async_host_resolver.cc b/net/dns/async_host_resolver.cc
index 27d307e..ed0d70f 100644
--- a/net/dns/async_host_resolver.cc
+++ b/net/dns/async_host_resolver.cc
@@ -86,7 +86,7 @@ class AsyncHostResolver::Request {
const BoundNetLog& request_net_log,
int id,
const HostResolver::RequestInfo& info,
- CompletionCallback* callback,
+ OldCompletionCallback* callback,
AddressList* addresses)
: resolver_(resolver),
source_net_log_(source_net_log),
@@ -173,7 +173,7 @@ class AsyncHostResolver::Request {
if (result == OK)
*addresses_ = CreateAddressListUsingPort(addresses, info_.port());
DCHECK(callback_);
- CompletionCallback* callback = callback_;
+ OldCompletionCallback* callback = callback_;
callback_ = NULL;
resolver_->OnFinish(this, result);
callback->Run(result);
@@ -191,7 +191,7 @@ class AsyncHostResolver::Request {
const int id_;
const HostResolver::RequestInfo info_;
Key key_;
- CompletionCallback* callback_;
+ OldCompletionCallback* callback_;
AddressList* addresses_;
int result_;
};
@@ -230,7 +230,7 @@ AsyncHostResolver::~AsyncHostResolver() {
int AsyncHostResolver::Resolve(const RequestInfo& info,
AddressList* addresses,
- CompletionCallback* callback,
+ OldCompletionCallback* callback,
RequestHandle* out_req,
const BoundNetLog& source_net_log) {
DCHECK(addresses);
@@ -410,7 +410,7 @@ void AsyncHostResolver::OnTransactionComplete(
AsyncHostResolver::Request* AsyncHostResolver::CreateNewRequest(
const RequestInfo& info,
- CompletionCallback* callback,
+ OldCompletionCallback* callback,
AddressList* addresses,
const BoundNetLog& source_net_log) {
BoundNetLog request_net_log = BoundNetLog::Make(net_log_,