OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/cronet/url_request_context_config.h" | 5 #include "components/cronet/url_request_context_config.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "base/strings/string_number_conversions.h" | 12 #include "base/strings/string_number_conversions.h" |
13 #include "base/strings/string_piece.h" | 13 #include "base/strings/string_piece.h" |
14 #include "base/strings/string_split.h" | 14 #include "base/strings/string_split.h" |
15 #include "base/values.h" | 15 #include "base/values.h" |
16 #include "net/cert/cert_verifier.h" | 16 #include "net/cert/cert_verifier.h" |
17 #include "net/dns/host_resolver.h" | 17 #include "net/dns/host_resolver.h" |
| 18 #include "net/http/http_server_properties.h" |
18 #include "net/quic/quic_protocol.h" | 19 #include "net/quic/quic_protocol.h" |
19 #include "net/quic/quic_utils.h" | 20 #include "net/quic/quic_utils.h" |
20 #include "net/url_request/url_request_context_builder.h" | 21 #include "net/url_request/url_request_context_builder.h" |
21 | 22 |
22 namespace cronet { | 23 namespace cronet { |
23 | 24 |
24 namespace { | 25 namespace { |
25 | 26 |
26 // TODO(xunjieli): Refactor constants in io_thread.cc. | 27 // TODO(xunjieli): Refactor constants in io_thread.cc. |
27 const char kQuicFieldTrialName[] = "QUIC"; | 28 const char kQuicFieldTrialName[] = "QUIC"; |
28 const char kQuicConnectionOptions[] = "connection_options"; | 29 const char kQuicConnectionOptions[] = "connection_options"; |
29 const char kQuicStoreServerConfigsInProperties[] = | 30 const char kQuicStoreServerConfigsInProperties[] = |
30 "store_server_configs_in_properties"; | 31 "store_server_configs_in_properties"; |
| 32 const char kQuicMaxServerConfigsStoredInProperties[] = |
| 33 "max_server_configs_stored_in_properties"; |
31 const char kQuicDelayTcpRace[] = "delay_tcp_race"; | 34 const char kQuicDelayTcpRace[] = "delay_tcp_race"; |
32 const char kQuicMaxNumberOfLossyConnections[] = | 35 const char kQuicMaxNumberOfLossyConnections[] = |
33 "max_number_of_lossy_connections"; | 36 "max_number_of_lossy_connections"; |
34 const char kQuicPacketLossThreshold[] = "packet_loss_threshold"; | 37 const char kQuicPacketLossThreshold[] = "packet_loss_threshold"; |
35 const char kQuicIdleConnectionTimeoutSeconds[] = | 38 const char kQuicIdleConnectionTimeoutSeconds[] = |
36 "idle_connection_timeout_seconds"; | 39 "idle_connection_timeout_seconds"; |
37 const char kQuicHostWhitelist[] = "host_whitelist"; | 40 const char kQuicHostWhitelist[] = "host_whitelist"; |
38 | 41 |
39 // AsyncDNS experiment dictionary name. | 42 // AsyncDNS experiment dictionary name. |
40 const char kAsyncDnsFieldTrialName[] = "AsyncDNS"; | 43 const char kAsyncDnsFieldTrialName[] = "AsyncDNS"; |
(...skipping 28 matching lines...) Expand all Loading... |
69 | 72 |
70 const base::DictionaryValue* quic_args = nullptr; | 73 const base::DictionaryValue* quic_args = nullptr; |
71 if (dict->GetDictionary(kQuicFieldTrialName, &quic_args)) { | 74 if (dict->GetDictionary(kQuicFieldTrialName, &quic_args)) { |
72 std::string quic_connection_options; | 75 std::string quic_connection_options; |
73 if (quic_args->GetString(kQuicConnectionOptions, | 76 if (quic_args->GetString(kQuicConnectionOptions, |
74 &quic_connection_options)) { | 77 &quic_connection_options)) { |
75 context_builder->set_quic_connection_options( | 78 context_builder->set_quic_connection_options( |
76 net::QuicUtils::ParseQuicConnectionOptions(quic_connection_options)); | 79 net::QuicUtils::ParseQuicConnectionOptions(quic_connection_options)); |
77 } | 80 } |
78 | 81 |
| 82 // TODO(rtenneti): Delete this option after apps stop using it. |
| 83 // Added this for backward compatibility. |
79 bool quic_store_server_configs_in_properties = false; | 84 bool quic_store_server_configs_in_properties = false; |
80 if (quic_args->GetBoolean(kQuicStoreServerConfigsInProperties, | 85 if (quic_args->GetBoolean(kQuicStoreServerConfigsInProperties, |
81 &quic_store_server_configs_in_properties)) { | 86 &quic_store_server_configs_in_properties)) { |
82 context_builder->set_quic_store_server_configs_in_properties( | 87 context_builder->set_quic_max_server_configs_stored_in_properties( |
83 quic_store_server_configs_in_properties); | 88 net::kMaxQuicServersToPersist); |
| 89 } |
| 90 |
| 91 int quic_max_server_configs_stored_in_properties = 0; |
| 92 if (quic_args->GetInteger(kQuicMaxServerConfigsStoredInProperties, |
| 93 &quic_max_server_configs_stored_in_properties)) { |
| 94 context_builder->set_quic_max_server_configs_stored_in_properties( |
| 95 static_cast<size_t>(quic_max_server_configs_stored_in_properties)); |
84 } | 96 } |
85 | 97 |
86 bool quic_delay_tcp_race = false; | 98 bool quic_delay_tcp_race = false; |
87 if (quic_args->GetBoolean(kQuicDelayTcpRace, &quic_delay_tcp_race)) { | 99 if (quic_args->GetBoolean(kQuicDelayTcpRace, &quic_delay_tcp_race)) { |
88 context_builder->set_quic_delay_tcp_race(quic_delay_tcp_race); | 100 context_builder->set_quic_delay_tcp_race(quic_delay_tcp_race); |
89 } | 101 } |
90 | 102 |
91 int quic_max_number_of_lossy_connections = 0; | 103 int quic_max_number_of_lossy_connections = 0; |
92 if (quic_args->GetInteger(kQuicMaxNumberOfLossyConnections, | 104 if (quic_args->GetInteger(kQuicMaxNumberOfLossyConnections, |
93 &quic_max_number_of_lossy_connections)) { | 105 &quic_max_number_of_lossy_connections)) { |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
213 | 225 |
214 ParseAndSetExperimentalOptions(experimental_options, context_builder, | 226 ParseAndSetExperimentalOptions(experimental_options, context_builder, |
215 net_log); | 227 net_log); |
216 | 228 |
217 if (mock_cert_verifier) | 229 if (mock_cert_verifier) |
218 context_builder->SetCertVerifier(std::move(mock_cert_verifier)); | 230 context_builder->SetCertVerifier(std::move(mock_cert_verifier)); |
219 // TODO(mef): Use |config| to set cookies. | 231 // TODO(mef): Use |config| to set cookies. |
220 } | 232 } |
221 | 233 |
222 } // namespace cronet | 234 } // namespace cronet |
OLD | NEW |