| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "ios/chrome/browser/ios_chrome_io_thread.h" | 5 #include "ios/chrome/browser/ios_chrome_io_thread.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 522 | 522 |
| 523 globals_->system_request_context.reset( | 523 globals_->system_request_context.reset( |
| 524 ConstructSystemRequestContext(globals_, params_, net_log_)); | 524 ConstructSystemRequestContext(globals_, params_, net_log_)); |
| 525 } | 525 } |
| 526 | 526 |
| 527 net::URLRequestContext* IOSChromeIOThread::ConstructSystemRequestContext( | 527 net::URLRequestContext* IOSChromeIOThread::ConstructSystemRequestContext( |
| 528 IOSChromeIOThread::Globals* globals, | 528 IOSChromeIOThread::Globals* globals, |
| 529 const net::HttpNetworkSession::Params& params, | 529 const net::HttpNetworkSession::Params& params, |
| 530 net::NetLog* net_log) { | 530 net::NetLog* net_log) { |
| 531 net::URLRequestContext* context = new SystemURLRequestContext; | 531 net::URLRequestContext* context = new SystemURLRequestContext; |
| 532 |
| 532 context->set_net_log(net_log); | 533 context->set_net_log(net_log); |
| 533 context->set_host_resolver(globals->host_resolver.get()); | 534 context->set_host_resolver(globals->host_resolver.get()); |
| 534 context->set_cert_verifier(globals->cert_verifier.get()); | 535 context->set_cert_verifier(globals->cert_verifier.get()); |
| 535 context->set_transport_security_state( | 536 context->set_transport_security_state( |
| 536 globals->transport_security_state.get()); | 537 globals->transport_security_state.get()); |
| 537 context->set_cert_transparency_verifier( | 538 context->set_cert_transparency_verifier( |
| 538 globals->cert_transparency_verifier.get()); | 539 globals->cert_transparency_verifier.get()); |
| 539 context->set_ssl_config_service(globals->ssl_config_service.get()); | 540 context->set_ssl_config_service(globals->ssl_config_service.get()); |
| 540 context->set_http_auth_handler_factory( | 541 context->set_http_auth_handler_factory( |
| 541 globals->http_auth_handler_factory.get()); | 542 globals->http_auth_handler_factory.get()); |
| (...skipping 13 matching lines...) Expand all Loading... |
| 555 context->set_cookie_store(globals->system_cookie_store.get()); | 556 context->set_cookie_store(globals->system_cookie_store.get()); |
| 556 context->set_channel_id_service(globals->system_channel_id_service.get()); | 557 context->set_channel_id_service(globals->system_channel_id_service.get()); |
| 557 context->set_network_delegate(globals->system_network_delegate.get()); | 558 context->set_network_delegate(globals->system_network_delegate.get()); |
| 558 context->set_http_user_agent_settings( | 559 context->set_http_user_agent_settings( |
| 559 globals->http_user_agent_settings.get()); | 560 globals->http_user_agent_settings.get()); |
| 560 context->set_network_quality_estimator( | 561 context->set_network_quality_estimator( |
| 561 globals->network_quality_estimator.get()); | 562 globals->network_quality_estimator.get()); |
| 562 | 563 |
| 563 context->set_http_server_properties(globals->http_server_properties.get()); | 564 context->set_http_server_properties(globals->http_server_properties.get()); |
| 564 | 565 |
| 565 net::HttpNetworkSession::Params system_params(params); | 566 net::HttpNetworkSession::Context session_context; |
| 566 net::URLRequestContextBuilder::SetHttpNetworkSessionComponents( | 567 net::URLRequestContextBuilder::SetHttpNetworkSessionComponents( |
| 567 context, &system_params); | 568 context, &session_context); |
| 568 | 569 |
| 569 globals->system_http_network_session.reset( | 570 globals->system_http_network_session.reset( |
| 570 new net::HttpNetworkSession(system_params)); | 571 new net::HttpNetworkSession(params, session_context)); |
| 571 globals->system_http_transaction_factory.reset( | 572 globals->system_http_transaction_factory.reset( |
| 572 new net::HttpNetworkLayer(globals->system_http_network_session.get())); | 573 new net::HttpNetworkLayer(globals->system_http_network_session.get())); |
| 573 context->set_http_transaction_factory( | 574 context->set_http_transaction_factory( |
| 574 globals->system_http_transaction_factory.get()); | 575 globals->system_http_transaction_factory.get()); |
| 575 | 576 |
| 576 return context; | 577 return context; |
| 577 } | 578 } |
| OLD | NEW |