| Index: net/base/mock_host_resolver.cc
|
| ===================================================================
|
| --- net/base/mock_host_resolver.cc (revision 29420)
|
| +++ net/base/mock_host_resolver.cc (working copy)
|
| @@ -165,6 +165,7 @@
|
| }
|
|
|
| int RuleBasedHostResolverProc::Resolve(const std::string& host,
|
| + AddressFamily address_family,
|
| AddressList* addrlist) {
|
| RuleList::iterator r;
|
| for (r = rules_.begin(); r != rules_.end(); ++r) {
|
| @@ -181,7 +182,9 @@
|
| case Rule::kResolverTypeFail:
|
| return ERR_NAME_NOT_RESOLVED;
|
| case Rule::kResolverTypeSystem:
|
| - return SystemHostResolverProc(effective_host, addrlist);
|
| + return SystemHostResolverProc(effective_host,
|
| + address_family,
|
| + addrlist);
|
| case Rule::kResolverTypeIPV6Literal:
|
| return ResolveIPV6LiteralUsingGURL(effective_host, addrlist);
|
| default:
|
| @@ -190,7 +193,7 @@
|
| }
|
| }
|
| }
|
| - return ResolveUsingPrevious(host, addrlist);
|
| + return ResolveUsingPrevious(host, address_family, addrlist);
|
| }
|
|
|
| //-----------------------------------------------------------------------------
|
|
|