| 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 364 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 375   network_session_params.testing_fixed_https_port = | 375   network_session_params.testing_fixed_https_port = | 
| 376       http_network_session_params_.testing_fixed_https_port; | 376       http_network_session_params_.testing_fixed_https_port; | 
| 377   network_session_params.use_alternative_services = | 377   network_session_params.use_alternative_services = | 
| 378       http_network_session_params_.use_alternative_services; | 378       http_network_session_params_.use_alternative_services; | 
| 379   network_session_params.trusted_spdy_proxy = | 379   network_session_params.trusted_spdy_proxy = | 
| 380       http_network_session_params_.trusted_spdy_proxy; | 380       http_network_session_params_.trusted_spdy_proxy; | 
| 381   network_session_params.next_protos = http_network_session_params_.next_protos; | 381   network_session_params.next_protos = http_network_session_params_.next_protos; | 
| 382   network_session_params.enable_quic = http_network_session_params_.enable_quic; | 382   network_session_params.enable_quic = http_network_session_params_.enable_quic; | 
| 383   network_session_params.quic_connection_options = | 383   network_session_params.quic_connection_options = | 
| 384       http_network_session_params_.quic_connection_options; | 384       http_network_session_params_.quic_connection_options; | 
|  | 385   network_session_params.cert_verifier = | 
|  | 386       http_network_session_params_.cert_verifier; | 
| 385 | 387 | 
| 386   scoped_ptr<HttpTransactionFactory> http_transaction_factory; | 388   scoped_ptr<HttpTransactionFactory> http_transaction_factory; | 
| 387   if (http_cache_enabled_) { | 389   if (http_cache_enabled_) { | 
| 388     HttpCache::BackendFactory* http_cache_backend = NULL; | 390     HttpCache::BackendFactory* http_cache_backend = NULL; | 
| 389     if (http_cache_params_.type == HttpCacheParams::DISK) { | 391     if (http_cache_params_.type == HttpCacheParams::DISK) { | 
| 390       http_cache_backend = new HttpCache::DefaultBackend( | 392       http_cache_backend = new HttpCache::DefaultBackend( | 
| 391           DISK_CACHE, CACHE_BACKEND_DEFAULT, http_cache_params_.path, | 393           DISK_CACHE, CACHE_BACKEND_DEFAULT, http_cache_params_.path, | 
| 392           http_cache_params_.max_size, context->GetFileTaskRunner()); | 394           http_cache_params_.max_size, context->GetFileTaskRunner()); | 
| 393     } else { | 395     } else { | 
| 394       http_cache_backend = | 396       http_cache_backend = | 
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 440     } | 442     } | 
| 441     url_request_interceptors_.weak_clear(); | 443     url_request_interceptors_.weak_clear(); | 
| 442   } | 444   } | 
| 443   storage->set_job_factory(top_job_factory.Pass()); | 445   storage->set_job_factory(top_job_factory.Pass()); | 
| 444   // TODO(willchan): Support sdch. | 446   // TODO(willchan): Support sdch. | 
| 445 | 447 | 
| 446   return context.Pass(); | 448   return context.Pass(); | 
| 447 } | 449 } | 
| 448 | 450 | 
| 449 }  // namespace net | 451 }  // namespace net | 
| OLD | NEW | 
|---|