summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authoragayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 04:11:50 +0000
committeragayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 04:11:50 +0000
commit6c1e21845d52076a03f1ed9ed6799190e1833dd3 (patch)
treef83a390db1b0497f6df51257e00e705852073e12 /chrome_frame
parenta6833b8c7436364df8ff118399a7b38dc7fcebc2 (diff)
downloadchromium_src-6c1e21845d52076a03f1ed9ed6799190e1833dd3.zip
chromium_src-6c1e21845d52076a03f1ed9ed6799190e1833dd3.tar.gz
chromium_src-6c1e21845d52076a03f1ed9ed6799190e1833dd3.tar.bz2
Initial support for built-in DNS resolver/cache.
BUG=None TEST=None Review URL: http://codereview.chromium.org/3693001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/metrics_service.cc2
-rw-r--r--chrome_frame/test/test_server_test.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc
index cb30b94..6af2c0e 100644
--- a/chrome_frame/metrics_service.cc
+++ b/chrome_frame/metrics_service.cc
@@ -149,7 +149,7 @@ class ChromeFrameUploadRequestContext : public URLRequestContext {
host_resolver_ =
net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism,
- NULL);
+ NULL, NULL);
net::ProxyConfigService* proxy_config_service =
net::ProxyService::CreateSystemProxyConfigService(NULL, NULL);
DCHECK(proxy_config_service);
diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc
index edef592..fae70ae 100644
--- a/chrome_frame/test/test_server_test.cc
+++ b/chrome_frame/test/test_server_test.cc
@@ -63,7 +63,7 @@ class URLRequestTestContext : public URLRequestContext {
URLRequestTestContext() {
host_resolver_ =
net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism,
- NULL);
+ NULL, NULL);
proxy_service_ = net::ProxyService::CreateDirect();
ssl_config_service_ = new net::SSLConfigServiceDefaults;
http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault(