| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/url_request/url_request_context_builder.h" | 5 #include "net/url_request/url_request_context_builder.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 | 193 |
| 194 URLRequestContext* URLRequestContextBuilder::Build() { | 194 URLRequestContext* URLRequestContextBuilder::Build() { |
| 195 BasicURLRequestContext* context = new BasicURLRequestContext; | 195 BasicURLRequestContext* context = new BasicURLRequestContext; |
| 196 URLRequestContextStorage* storage = context->storage(); | 196 URLRequestContextStorage* storage = context->storage(); |
| 197 | 197 |
| 198 storage->set_http_user_agent_settings(new StaticHttpUserAgentSettings( | 198 storage->set_http_user_agent_settings(new StaticHttpUserAgentSettings( |
| 199 accept_language_, accept_charset_, user_agent_)); | 199 accept_language_, accept_charset_, user_agent_)); |
| 200 | 200 |
| 201 if (!network_delegate_) | 201 if (!network_delegate_) |
| 202 network_delegate_.reset(new BasicNetworkDelegate); | 202 network_delegate_.reset(new BasicNetworkDelegate); |
| 203 storage->set_network_delegate(network_delegate_.release()); | 203 NetworkDelegate* network_delegate = network_delegate_.release(); |
| 204 storage->set_network_delegate(network_delegate); |
| 204 | 205 |
| 205 storage->set_host_resolver(net::HostResolver::CreateDefaultResolver(NULL)); | 206 storage->set_host_resolver(net::HostResolver::CreateDefaultResolver(NULL)); |
| 206 | 207 |
| 207 if (ftp_enabled_) { | 208 if (ftp_enabled_) { |
| 208 storage->set_ftp_transaction_factory( | 209 storage->set_ftp_transaction_factory( |
| 209 new FtpNetworkLayer(context->host_resolver())); | 210 new FtpNetworkLayer(context->host_resolver())); |
| 210 } | 211 } |
| 211 | 212 |
| 212 context->StartFileThread(); | 213 context->StartFileThread(); |
| 213 | 214 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 238 net::HttpNetworkSession::Params network_session_params; | 239 net::HttpNetworkSession::Params network_session_params; |
| 239 network_session_params.host_resolver = context->host_resolver(); | 240 network_session_params.host_resolver = context->host_resolver(); |
| 240 network_session_params.cert_verifier = context->cert_verifier(); | 241 network_session_params.cert_verifier = context->cert_verifier(); |
| 241 network_session_params.transport_security_state = | 242 network_session_params.transport_security_state = |
| 242 context->transport_security_state(); | 243 context->transport_security_state(); |
| 243 network_session_params.proxy_service = context->proxy_service(); | 244 network_session_params.proxy_service = context->proxy_service(); |
| 244 network_session_params.ssl_config_service = | 245 network_session_params.ssl_config_service = |
| 245 context->ssl_config_service(); | 246 context->ssl_config_service(); |
| 246 network_session_params.http_auth_handler_factory = | 247 network_session_params.http_auth_handler_factory = |
| 247 context->http_auth_handler_factory(); | 248 context->http_auth_handler_factory(); |
| 248 network_session_params.network_delegate = | 249 network_session_params.network_delegate = network_delegate; |
| 249 context->network_delegate(); | |
| 250 network_session_params.http_server_properties = | 250 network_session_params.http_server_properties = |
| 251 context->http_server_properties(); | 251 context->http_server_properties(); |
| 252 network_session_params.net_log = context->net_log(); | 252 network_session_params.net_log = context->net_log(); |
| 253 network_session_params.ignore_certificate_errors = | 253 network_session_params.ignore_certificate_errors = |
| 254 http_network_session_params_.ignore_certificate_errors; | 254 http_network_session_params_.ignore_certificate_errors; |
| 255 network_session_params.host_mapping_rules = | 255 network_session_params.host_mapping_rules = |
| 256 http_network_session_params_.host_mapping_rules; | 256 http_network_session_params_.host_mapping_rules; |
| 257 network_session_params.http_pipelining_enabled = | 257 network_session_params.http_pipelining_enabled = |
| 258 http_network_session_params_.http_pipelining_enabled; | 258 http_network_session_params_.http_pipelining_enabled; |
| 259 network_session_params.testing_fixed_http_port = | 259 network_session_params.testing_fixed_http_port = |
| (...skipping 29 matching lines...) Expand all Loading... |
| 289 http_transaction_factory = new HttpNetworkLayer(network_session); | 289 http_transaction_factory = new HttpNetworkLayer(network_session); |
| 290 } | 290 } |
| 291 storage->set_http_transaction_factory(http_transaction_factory); | 291 storage->set_http_transaction_factory(http_transaction_factory); |
| 292 | 292 |
| 293 // TODO(willchan): Support sdch. | 293 // TODO(willchan): Support sdch. |
| 294 | 294 |
| 295 return context; | 295 return context; |
| 296 } | 296 } |
| 297 | 297 |
| 298 } // namespace net | 298 } // namespace net |
| OLD | NEW |