Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1370)

Unified Diff: net/base/mock_host_resolver.cc

Issue 302010: Add a mechanism to disable IPv6.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Address darin's comments Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}
//-----------------------------------------------------------------------------
« net/base/host_resolver_impl.h ('K') | « net/base/mock_host_resolver.h ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698