| 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 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 network_session_params.testing_fixed_https_port = | 295 network_session_params.testing_fixed_https_port = |
| 296 http_network_session_params_.testing_fixed_https_port; | 296 http_network_session_params_.testing_fixed_https_port; |
| 297 network_session_params.use_alternate_protocols = | 297 network_session_params.use_alternate_protocols = |
| 298 http_network_session_params_.use_alternate_protocols; | 298 http_network_session_params_.use_alternate_protocols; |
| 299 network_session_params.trusted_spdy_proxy = | 299 network_session_params.trusted_spdy_proxy = |
| 300 http_network_session_params_.trusted_spdy_proxy; | 300 http_network_session_params_.trusted_spdy_proxy; |
| 301 network_session_params.next_protos = http_network_session_params_.next_protos; | 301 network_session_params.next_protos = http_network_session_params_.next_protos; |
| 302 | 302 |
| 303 HttpTransactionFactory* http_transaction_factory = NULL; | 303 HttpTransactionFactory* http_transaction_factory = NULL; |
| 304 if (http_cache_enabled_) { | 304 if (http_cache_enabled_) { |
| 305 network_session_params.server_bound_cert_service = | 305 network_session_params.channel_id_service = |
| 306 context->server_bound_cert_service(); | 306 context->channel_id_service(); |
| 307 HttpCache::BackendFactory* http_cache_backend = NULL; | 307 HttpCache::BackendFactory* http_cache_backend = NULL; |
| 308 if (http_cache_params_.type == HttpCacheParams::DISK) { | 308 if (http_cache_params_.type == HttpCacheParams::DISK) { |
| 309 http_cache_backend = new HttpCache::DefaultBackend( | 309 http_cache_backend = new HttpCache::DefaultBackend( |
| 310 DISK_CACHE, | 310 DISK_CACHE, |
| 311 net::CACHE_BACKEND_DEFAULT, | 311 net::CACHE_BACKEND_DEFAULT, |
| 312 http_cache_params_.path, | 312 http_cache_params_.path, |
| 313 http_cache_params_.max_size, | 313 http_cache_params_.max_size, |
| 314 context->GetCacheThread()->message_loop_proxy().get()); | 314 context->GetCacheThread()->message_loop_proxy().get()); |
| 315 } else { | 315 } else { |
| 316 http_cache_backend = | 316 http_cache_backend = |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 349 #endif // !defined(DISABLE_FTP_SUPPORT) | 349 #endif // !defined(DISABLE_FTP_SUPPORT) |
| 350 | 350 |
| 351 storage->set_job_factory(job_factory); | 351 storage->set_job_factory(job_factory); |
| 352 | 352 |
| 353 // TODO(willchan): Support sdch. | 353 // TODO(willchan): Support sdch. |
| 354 | 354 |
| 355 return context; | 355 return context; |
| 356 } | 356 } |
| 357 | 357 |
| 358 } // namespace net | 358 } // namespace net |
| OLD | NEW |