| Index: net/base/host_resolver_proc.cc
|
| diff --git a/net/base/host_resolver_proc.cc b/net/base/host_resolver_proc.cc
|
| index f33195cf2ef2e679d2324ae14bd322d57ec6ff49..b1230fa95dbe5441d4938ea429bd3df80c47853c 100644
|
| --- a/net/base/host_resolver_proc.cc
|
| +++ b/net/base/host_resolver_proc.cc
|
| @@ -64,6 +64,25 @@ HostResolverProc::HostResolverProc(HostResolverProc* previous) {
|
| SetPreviousProc(default_proc_);
|
| }
|
|
|
| +HostResolverProc::~HostResolverProc() {
|
| +}
|
| +
|
| +int HostResolverProc::ResolveUsingPrevious(
|
| + const std::string& host,
|
| + AddressFamily address_family,
|
| + HostResolverFlags host_resolver_flags,
|
| + AddressList* addrlist,
|
| + int* os_error) {
|
| + if (previous_proc_) {
|
| + return previous_proc_->Resolve(host, address_family, host_resolver_flags,
|
| + addrlist, os_error);
|
| + }
|
| +
|
| + // Final fallback is the system resolver.
|
| + return SystemHostResolverProc(host, address_family, host_resolver_flags,
|
| + addrlist, os_error);
|
| +}
|
| +
|
| void HostResolverProc::SetPreviousProc(HostResolverProc* proc) {
|
| HostResolverProc* current_previous = previous_proc_;
|
| previous_proc_ = NULL;
|
| @@ -98,25 +117,6 @@ HostResolverProc* HostResolverProc::GetDefault() {
|
| return default_proc_;
|
| }
|
|
|
| -HostResolverProc::~HostResolverProc() {
|
| -}
|
| -
|
| -int HostResolverProc::ResolveUsingPrevious(
|
| - const std::string& host,
|
| - AddressFamily address_family,
|
| - HostResolverFlags host_resolver_flags,
|
| - AddressList* addrlist,
|
| - int* os_error) {
|
| - if (previous_proc_) {
|
| - return previous_proc_->Resolve(host, address_family, host_resolver_flags,
|
| - addrlist, os_error);
|
| - }
|
| -
|
| - // Final fallback is the system resolver.
|
| - return SystemHostResolverProc(host, address_family, host_resolver_flags,
|
| - addrlist, os_error);
|
| -}
|
| -
|
| int SystemHostResolverProc(const std::string& host,
|
| AddressFamily address_family,
|
| HostResolverFlags host_resolver_flags,
|
|
|