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

Unified Diff: net/url_request/url_request_context_builder.cc

Issue 10831277: [net] Change factory methods for HostResolver and HostCache to return a scoped_ptr (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add ChromeBrowserFieldTrials::AsyncDnsFieldTrial Created 8 years, 4 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/url_request/url_request_context_builder.cc
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
index e6baddcba3f1f778334fcc358c9e895fea5d8efd..9f22eb7e4a883730d68c49b145097f165b48dd7f 100644
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -171,11 +171,6 @@ class BasicURLRequestContext : public URLRequestContext {
} // namespace
-URLRequestContextBuilder::HostResolverParams::HostResolverParams()
- : parallelism(HostResolver::kDefaultParallelism),
- retry_attempts(HostResolver::kDefaultRetryAttempts) {}
-URLRequestContextBuilder::HostResolverParams::~HostResolverParams() {}
-
URLRequestContextBuilder::HttpCacheParams::HttpCacheParams()
: type(IN_MEMORY),
max_size(0) {}
@@ -202,14 +197,12 @@ URLRequestContext* URLRequestContextBuilder::Build() {
BasicNetworkDelegate* network_delegate = new BasicNetworkDelegate;
storage->set_network_delegate(network_delegate);
- net::HostResolver* host_resolver = net::CreateSystemHostResolver(
- host_resolver_params_.parallelism,
- host_resolver_params_.retry_attempts,
- NULL /* no NetLog */);
- storage->set_host_resolver(host_resolver);
+ storage->set_host_resolver(
+ net::HostResolver::CreateDefaultResolver(NULL).release());
if (ftp_enabled_) {
- storage->set_ftp_transaction_factory(new FtpNetworkLayer(host_resolver));
+ storage->set_ftp_transaction_factory(
+ new FtpNetworkLayer(context->host_resolver()));
}
context->StartFileThread();
@@ -231,7 +224,8 @@ URLRequestContext* URLRequestContextBuilder::Build() {
context->net_log()));
storage->set_ssl_config_service(new net::SSLConfigServiceDefaults);
storage->set_http_auth_handler_factory(
- net::HttpAuthHandlerRegistryFactory::CreateDefault(host_resolver));
+ net::HttpAuthHandlerRegistryFactory::CreateDefault(
+ context->host_resolver()));
storage->set_cookie_store(new CookieMonster(NULL, NULL));
storage->set_transport_security_state(new net::TransportSecurityState());
storage->set_http_server_properties(new net::HttpServerPropertiesImpl);

Powered by Google App Engine
This is Rietveld 408576698