summaryrefslogtreecommitdiffstats
path: root/net/base/mock_host_resolver.cc
diff options
context:
space:
mode:
Diffstat (limited to 'net/base/mock_host_resolver.cc')
-rw-r--r--net/base/mock_host_resolver.cc12
1 files changed, 9 insertions, 3 deletions
diff --git a/net/base/mock_host_resolver.cc b/net/base/mock_host_resolver.cc
index c079fc1..9e57fd1 100644
--- a/net/base/mock_host_resolver.cc
+++ b/net/base/mock_host_resolver.cc
@@ -153,8 +153,11 @@ void RuleBasedHostResolverProc::AddRuleForAddressFamily(
void RuleBasedHostResolverProc::AddIPv6Rule(const std::string& host_pattern,
const std::string& ipv6_literal) {
- Rule rule(Rule::kResolverTypeIPV6Literal, host_pattern,
- ADDRESS_FAMILY_UNSPECIFIED, ipv6_literal, 0);
+ Rule rule(Rule::kResolverTypeIPV6Literal,
+ host_pattern,
+ ADDRESS_FAMILY_UNSPECIFIED,
+ ipv6_literal,
+ 0);
rules_.push_back(rule);
}
@@ -184,6 +187,7 @@ void RuleBasedHostResolverProc::AddSimulatedFailure(
int RuleBasedHostResolverProc::Resolve(const std::string& host,
AddressFamily address_family,
+ HostResolverFlags host_resolver_flags,
AddressList* addrlist) {
RuleList::iterator r;
for (r = rules_.begin(); r != rules_.end(); ++r) {
@@ -206,6 +210,7 @@ int RuleBasedHostResolverProc::Resolve(const std::string& host,
case Rule::kResolverTypeSystem:
return SystemHostResolverProc(effective_host,
address_family,
+ host_resolver_flags,
addrlist);
case Rule::kResolverTypeIPV6Literal:
return ResolveIPV6LiteralUsingGURL(effective_host, addrlist);
@@ -215,7 +220,8 @@ int RuleBasedHostResolverProc::Resolve(const std::string& host,
}
}
}
- return ResolveUsingPrevious(host, address_family, addrlist);
+ return ResolveUsingPrevious(host, address_family,
+ host_resolver_flags, addrlist);
}
//-----------------------------------------------------------------------------