| 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 911 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 922 is_quic_force_enabled, | 922 is_quic_force_enabled, |
| 923 quic_user_agent_id, params); | 923 quic_user_agent_id, params); |
| 924 | 924 |
| 925 // Command line flags override field trials. | 925 // Command line flags override field trials. |
| 926 if (command_line.HasSwitch(switches::kIgnoreUrlFetcherCertRequests)) | 926 if (command_line.HasSwitch(switches::kIgnoreUrlFetcherCertRequests)) |
| 927 net::URLFetcher::SetIgnoreCertificateRequests(true); | 927 net::URLFetcher::SetIgnoreCertificateRequests(true); |
| 928 | 928 |
| 929 if (command_line.HasSwitch(switches::kDisableHttp2)) | 929 if (command_line.HasSwitch(switches::kDisableHttp2)) |
| 930 params->enable_http2 = false; | 930 params->enable_http2 = false; |
| 931 | 931 |
| 932 if (command_line.HasSwitch(switches::kDisableQuicPortSelection)) { | |
| 933 params->enable_quic_port_selection = false; | |
| 934 } else if (command_line.HasSwitch(switches::kEnableQuicPortSelection)) { | |
| 935 params->enable_quic_port_selection = true; | |
| 936 } | |
| 937 | |
| 938 if (params->enable_quic) { | 932 if (params->enable_quic) { |
| 939 if (command_line.HasSwitch(switches::kQuicConnectionOptions)) { | 933 if (command_line.HasSwitch(switches::kQuicConnectionOptions)) { |
| 940 params->quic_connection_options = | 934 params->quic_connection_options = |
| 941 net::QuicUtils::ParseQuicConnectionOptions( | 935 net::QuicUtils::ParseQuicConnectionOptions( |
| 942 command_line.GetSwitchValueASCII( | 936 command_line.GetSwitchValueASCII( |
| 943 switches::kQuicConnectionOptions)); | 937 switches::kQuicConnectionOptions)); |
| 944 } | 938 } |
| 945 | 939 |
| 946 if (command_line.HasSwitch(switches::kQuicHostWhitelist)) { | 940 if (command_line.HasSwitch(switches::kQuicHostWhitelist)) { |
| 947 std::string whitelist = | 941 std::string whitelist = |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1075 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the | 1069 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the |
| 1076 // system URLRequestContext too. There's no reason this should be tied to a | 1070 // system URLRequestContext too. There's no reason this should be tied to a |
| 1077 // profile. | 1071 // profile. |
| 1078 return context; | 1072 return context; |
| 1079 } | 1073 } |
| 1080 | 1074 |
| 1081 const metrics::UpdateUsagePrefCallbackType& | 1075 const metrics::UpdateUsagePrefCallbackType& |
| 1082 IOThread::GetMetricsDataUseForwarder() { | 1076 IOThread::GetMetricsDataUseForwarder() { |
| 1083 return metrics_data_use_forwarder_; | 1077 return metrics_data_use_forwarder_; |
| 1084 } | 1078 } |
| OLD | NEW |