summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authoryusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 04:59:30 +0000
committeryusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 04:59:30 +0000
commit7632306dce9282980437c3982cfb97bebc5684ec (patch)
tree716a703f5ee4e3d4382c140aec6e424a195aacd4 /chrome_frame
parent6c1e21845d52076a03f1ed9ed6799190e1833dd3 (diff)
downloadchromium_src-7632306dce9282980437c3982cfb97bebc5684ec.zip
chromium_src-7632306dce9282980437c3982cfb97bebc5684ec.tar.gz
chromium_src-7632306dce9282980437c3982cfb97bebc5684ec.tar.bz2
Revert 64202 - Initial support for built-in DNS resolver/cache.
BUG=None TEST=None Review URL: http://codereview.chromium.org/3693001 TBR=agayev@chromium.org Review URL: http://codereview.chromium.org/4208002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64204 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 6af2c0e..cb30b94 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 fae70ae..edef592 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(