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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 #include "net/dns/host_resolver.h" | 56 #include "net/dns/host_resolver.h" |
57 #include "net/dns/mapped_host_resolver.h" | 57 #include "net/dns/mapped_host_resolver.h" |
58 #include "net/http/http_auth_filter.h" | 58 #include "net/http/http_auth_filter.h" |
59 #include "net/http/http_auth_handler_factory.h" | 59 #include "net/http/http_auth_handler_factory.h" |
60 #include "net/http/http_auth_preferences.h" | 60 #include "net/http/http_auth_preferences.h" |
61 #include "net/http/http_network_layer.h" | 61 #include "net/http/http_network_layer.h" |
62 #include "net/http/http_server_properties_impl.h" | 62 #include "net/http/http_server_properties_impl.h" |
63 #include "net/log/net_log_event_type.h" | 63 #include "net/log/net_log_event_type.h" |
64 #include "net/nqe/external_estimate_provider.h" | 64 #include "net/nqe/external_estimate_provider.h" |
65 #include "net/nqe/network_quality_estimator.h" | 65 #include "net/nqe/network_quality_estimator.h" |
| 66 #include "net/nqe/network_quality_estimator_params.h" |
66 #include "net/proxy/proxy_config_service.h" | 67 #include "net/proxy/proxy_config_service.h" |
67 #include "net/proxy/proxy_script_fetcher_impl.h" | 68 #include "net/proxy/proxy_script_fetcher_impl.h" |
68 #include "net/proxy/proxy_service.h" | 69 #include "net/proxy/proxy_service.h" |
69 #include "net/socket/tcp_client_socket.h" | 70 #include "net/socket/tcp_client_socket.h" |
70 #include "net/spdy/chromium/spdy_session.h" | 71 #include "net/spdy/chromium/spdy_session.h" |
71 #include "net/ssl/channel_id_service.h" | 72 #include "net/ssl/channel_id_service.h" |
72 #include "net/ssl/default_channel_id_store.h" | 73 #include "net/ssl/default_channel_id_store.h" |
73 #include "net/url_request/data_protocol_handler.h" | 74 #include "net/url_request/data_protocol_handler.h" |
74 #include "net/url_request/file_protocol_handler.h" | 75 #include "net/url_request/file_protocol_handler.h" |
75 #include "net/url_request/static_http_user_agent_settings.h" | 76 #include "net/url_request/static_http_user_agent_settings.h" |
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
354 globals_->system_network_delegate = std::move(chrome_network_delegate); | 355 globals_->system_network_delegate = std::move(chrome_network_delegate); |
355 globals_->host_resolver = CreateGlobalHostResolver(net_log_); | 356 globals_->host_resolver = CreateGlobalHostResolver(net_log_); |
356 | 357 |
357 std::map<std::string, std::string> network_quality_estimator_params; | 358 std::map<std::string, std::string> network_quality_estimator_params; |
358 variations::GetVariationParams(kNetworkQualityEstimatorFieldTrialName, | 359 variations::GetVariationParams(kNetworkQualityEstimatorFieldTrialName, |
359 &network_quality_estimator_params); | 360 &network_quality_estimator_params); |
360 | 361 |
361 std::unique_ptr<net::ExternalEstimateProvider> external_estimate_provider; | 362 std::unique_ptr<net::ExternalEstimateProvider> external_estimate_provider; |
362 // Pass ownership. | 363 // Pass ownership. |
363 globals_->network_quality_estimator.reset(new net::NetworkQualityEstimator( | 364 globals_->network_quality_estimator.reset(new net::NetworkQualityEstimator( |
364 std::move(external_estimate_provider), network_quality_estimator_params, | 365 std::move(external_estimate_provider), |
| 366 base::MakeUnique<net::NetworkQualityEstimatorParams>( |
| 367 network_quality_estimator_params), |
365 net_log_)); | 368 net_log_)); |
366 | 369 |
367 globals_->cert_verifier = net::CertVerifier::CreateDefault(); | 370 globals_->cert_verifier = net::CertVerifier::CreateDefault(); |
368 | 371 |
369 globals_->transport_security_state.reset(new net::TransportSecurityState()); | 372 globals_->transport_security_state.reset(new net::TransportSecurityState()); |
370 | 373 |
371 std::vector<scoped_refptr<const net::CTLogVerifier>> ct_logs( | 374 std::vector<scoped_refptr<const net::CTLogVerifier>> ct_logs( |
372 net::ct::CreateLogVerifiersForKnownLogs()); | 375 net::ct::CreateLogVerifiersForKnownLogs()); |
373 | 376 |
374 net::MultiLogCTVerifier* ct_verifier = new net::MultiLogCTVerifier(); | 377 net::MultiLogCTVerifier* ct_verifier = new net::MultiLogCTVerifier(); |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
568 | 571 |
569 globals->system_http_network_session.reset( | 572 globals->system_http_network_session.reset( |
570 new net::HttpNetworkSession(system_params)); | 573 new net::HttpNetworkSession(system_params)); |
571 globals->system_http_transaction_factory.reset( | 574 globals->system_http_transaction_factory.reset( |
572 new net::HttpNetworkLayer(globals->system_http_network_session.get())); | 575 new net::HttpNetworkLayer(globals->system_http_network_session.get())); |
573 context->set_http_transaction_factory( | 576 context->set_http_transaction_factory( |
574 globals->system_http_transaction_factory.get()); | 577 globals->system_http_transaction_factory.get()); |
575 | 578 |
576 return context; | 579 return context; |
577 } | 580 } |
OLD | NEW |