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 "chrome/browser/io_thread.h" | 5 #include "chrome/browser/io_thread.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/base64.h" | 10 #include "base/base64.h" |
(...skipping 608 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
619 // constructed from a NetworkSession::Params, to allow us to move this option | 619 // constructed from a NetworkSession::Params, to allow us to move this option |
620 // to IOThread::Globals & HttpNetworkSession::Params. | 620 // to IOThread::Globals & HttpNetworkSession::Params. |
621 bool always_enable_tfo_if_supported = | 621 bool always_enable_tfo_if_supported = |
622 command_line.HasSwitch(switches::kEnableTcpFastOpen); | 622 command_line.HasSwitch(switches::kEnableTcpFastOpen); |
623 net::CheckSupportAndMaybeEnableTCPFastOpen(always_enable_tfo_if_supported); | 623 net::CheckSupportAndMaybeEnableTCPFastOpen(always_enable_tfo_if_supported); |
624 | 624 |
625 ConfigureParamsFromFieldTrialsAndCommandLine( | 625 ConfigureParamsFromFieldTrialsAndCommandLine( |
626 command_line, is_quic_allowed_by_policy_, | 626 command_line, is_quic_allowed_by_policy_, |
627 http_09_on_non_default_ports_enabled_, ¶ms_); | 627 http_09_on_non_default_ports_enabled_, ¶ms_); |
628 | 628 |
| 629 globals_->http_network_session_shared_params.reset( |
| 630 new net::HttpNetworkSession::SharedParams()); |
| 631 params_.shared_dynamic_params = |
| 632 globals_->http_network_session_shared_params.get(); |
| 633 |
629 TRACE_EVENT_BEGIN0("startup", | 634 TRACE_EVENT_BEGIN0("startup", |
630 "IOThread::Init:ProxyScriptFetcherRequestContext"); | 635 "IOThread::Init:ProxyScriptFetcherRequestContext"); |
631 globals_->proxy_script_fetcher_context.reset( | 636 globals_->proxy_script_fetcher_context.reset( |
632 ConstructProxyScriptFetcherContext(globals_, params_, net_log_)); | 637 ConstructProxyScriptFetcherContext(globals_, params_, net_log_)); |
633 TRACE_EVENT_END0("startup", | 638 TRACE_EVENT_END0("startup", |
634 "IOThread::Init:ProxyScriptFetcherRequestContext"); | 639 "IOThread::Init:ProxyScriptFetcherRequestContext"); |
635 | 640 |
636 #if defined(OS_MACOSX) | 641 #if defined(OS_MACOSX) |
637 // Start observing Keychain events. This needs to be done on the UI thread, | 642 // Start observing Keychain events. This needs to be done on the UI thread, |
638 // as Keychain services requires a CFRunLoop. | 643 // as Keychain services requires a CFRunLoop. |
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1075 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the | 1080 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the |
1076 // system URLRequestContext too. There's no reason this should be tied to a | 1081 // system URLRequestContext too. There's no reason this should be tied to a |
1077 // profile. | 1082 // profile. |
1078 return context; | 1083 return context; |
1079 } | 1084 } |
1080 | 1085 |
1081 const metrics::UpdateUsagePrefCallbackType& | 1086 const metrics::UpdateUsagePrefCallbackType& |
1082 IOThread::GetMetricsDataUseForwarder() { | 1087 IOThread::GetMetricsDataUseForwarder() { |
1083 return metrics_data_use_forwarder_; | 1088 return metrics_data_use_forwarder_; |
1084 } | 1089 } |
OLD | NEW |