| Index: net/base/host_resolver.cc
|
| ===================================================================
|
| --- net/base/host_resolver.cc (revision 87863)
|
| +++ net/base/host_resolver.cc (working copy)
|
| @@ -4,10 +4,6 @@
|
|
|
| #include "net/base/host_resolver.h"
|
|
|
| -#include "base/compiler_specific.h"
|
| -#include "base/logging.h"
|
| -#include "net/base/net_errors.h"
|
| -
|
| namespace net {
|
|
|
| HostResolver::RequestInfo::RequestInfo(const HostPortPair& host_port_pair)
|
| @@ -34,61 +30,4 @@
|
| HostResolver::HostResolver() {
|
| }
|
|
|
| -SingleRequestHostResolver::SingleRequestHostResolver(HostResolver* resolver)
|
| - : resolver_(resolver),
|
| - cur_request_(NULL),
|
| - cur_request_callback_(NULL),
|
| - ALLOW_THIS_IN_INITIALIZER_LIST(
|
| - callback_(this, &SingleRequestHostResolver::OnResolveCompletion)) {
|
| - DCHECK(resolver_ != NULL);
|
| -}
|
| -
|
| -SingleRequestHostResolver::~SingleRequestHostResolver() {
|
| - Cancel();
|
| -}
|
| -
|
| -int SingleRequestHostResolver::Resolve(const HostResolver::RequestInfo& info,
|
| - AddressList* addresses,
|
| - CompletionCallback* callback,
|
| - const BoundNetLog& net_log) {
|
| - DCHECK(!cur_request_ && !cur_request_callback_) << "resolver already in use";
|
| -
|
| - HostResolver::RequestHandle request = NULL;
|
| -
|
| - // 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;
|
| -
|
| - int rv = resolver_->Resolve(
|
| - info, addresses, transient_callback, &request, net_log);
|
| -
|
| - if (rv == ERR_IO_PENDING) {
|
| - // Cleared in OnResolveCompletion().
|
| - cur_request_ = request;
|
| - cur_request_callback_ = callback;
|
| - }
|
| -
|
| - return rv;
|
| -}
|
| -
|
| -void SingleRequestHostResolver::Cancel() {
|
| - if (cur_request_) {
|
| - resolver_->CancelRequest(cur_request_);
|
| - cur_request_ = NULL;
|
| - }
|
| -}
|
| -
|
| -void SingleRequestHostResolver::OnResolveCompletion(int result) {
|
| - DCHECK(cur_request_ && cur_request_callback_);
|
| -
|
| - CompletionCallback* callback = cur_request_callback_;
|
| -
|
| - // Clear the outstanding request information.
|
| - cur_request_ = NULL;
|
| - cur_request_callback_ = NULL;
|
| -
|
| - // Call the user's original callback.
|
| - callback->Run(result);
|
| -}
|
| -
|
| } // namespace net
|
|
|