summaryrefslogtreecommitdiffstats
path: root/net/url_request
diff options
context:
space:
mode:
authoragayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 17:51:19 +0000
committeragayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 17:51:19 +0000
commit2258c1c968ab008aa0bc75f2cbe56b2249194aff (patch)
tree72f799611e613f40c5e26bf8adb7622356edcbf9 /net/url_request
parentd7b99393eb462ee93633028cfda04d33e8c37904 (diff)
downloadchromium_src-2258c1c968ab008aa0bc75f2cbe56b2249194aff.zip
chromium_src-2258c1c968ab008aa0bc75f2cbe56b2249194aff.tar.gz
chromium_src-2258c1c968ab008aa0bc75f2cbe56b2249194aff.tar.bz2
Initial support for built-in DNS resolver/cache.
BUG=60149 TEST=None Review URL: http://codereview.chromium.org/4216001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
-rw-r--r--net/url_request/url_request_unittest.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h
index 2a3ae41..abb6ab5 100644
--- a/net/url_request/url_request_unittest.h
+++ b/net/url_request/url_request_unittest.h
@@ -126,7 +126,7 @@ class TestURLRequestContext : public URLRequestContext {
TestURLRequestContext() {
host_resolver_ =
net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism,
- NULL);
+ NULL, NULL);
proxy_service_ = net::ProxyService::CreateDirect();
Init();
}
@@ -134,7 +134,7 @@ class TestURLRequestContext : public URLRequestContext {
explicit TestURLRequestContext(const std::string& proxy) {
host_resolver_ =
net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism,
- NULL);
+ NULL, NULL);
net::ProxyConfig proxy_config;
proxy_config.proxy_rules().ParseFromString(proxy);
proxy_service_ = net::ProxyService::CreateFixed(proxy_config);