| Index: chrome/browser/intranet_redirect_detector.cc
|
| diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc
|
| index 3a527f65d95c4fd19e1c778ec5b2ad8d9844896a..c491a30976b04b0014f3ac43d93d0e11f31318a8 100644
|
| --- a/chrome/browser/intranet_redirect_detector.cc
|
| +++ b/chrome/browser/intranet_redirect_detector.cc
|
| @@ -156,9 +156,11 @@ IntranetRedirectHostResolverProc::IntranetRedirectHostResolverProc(
|
| : net::HostResolverProc(previous) {
|
| }
|
|
|
| -int IntranetRedirectHostResolverProc::Resolve(const std::string& host,
|
| - net::AddressFamily address_family,
|
| - net::AddressList* addrlist) {
|
| +int IntranetRedirectHostResolverProc::Resolve(
|
| + const std::string& host,
|
| + net::AddressFamily address_family,
|
| + net::HostResolverFlags host_resolver_flags,
|
| + net::AddressList* addrlist) {
|
| // We'd love to just ask the IntranetRedirectDetector, but we may not be on
|
| // the same thread. So just use the heuristic that any all-lowercase a-z
|
| // hostname with the right number of characters is likely from the detector
|
| @@ -167,5 +169,5 @@ int IntranetRedirectHostResolverProc::Resolve(const std::string& host,
|
| (host.find_first_not_of("abcdefghijklmnopqrstuvwxyz") ==
|
| std::string::npos)) ?
|
| net::ERR_NAME_NOT_RESOLVED :
|
| - ResolveUsingPrevious(host, address_family, addrlist);
|
| + ResolveUsingPrevious(host, address_family, host_resolver_flags, addrlist);
|
| }
|
|
|