| Index: net/test/spawned_test_server/base_test_server.cc
|
| diff --git a/net/test/spawned_test_server/base_test_server.cc b/net/test/spawned_test_server/base_test_server.cc
|
| index 775341b608e6bd93ffe56712b1a676a3477b9bc5..6b570b814007ebd4c198015518832495b7a9bf92 100644
|
| --- a/net/test/spawned_test_server/base_test_server.cc
|
| +++ b/net/test/spawned_test_server/base_test_server.cc
|
| @@ -398,12 +398,16 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const {
|
| arguments->Set("tls-intolerant",
|
| new base::FundamentalValue(ssl_options_.tls_intolerant));
|
| }
|
| - if (!ssl_options_.signed_cert_timestamps.empty()) {
|
| - std::string b64_scts;
|
| - if (!base::Base64Encode(ssl_options_.signed_cert_timestamps, &b64_scts))
|
| + if (!ssl_options_.signed_cert_timestamps_tls_ext.empty()) {
|
| + std::string b64_scts_tls_ext;
|
| + if (!base::Base64Encode(ssl_options_.signed_cert_timestamps_tls_ext,
|
| + &b64_scts_tls_ext)) {
|
| return false;
|
| - arguments->SetString("signed-cert-timestamps", b64_scts);
|
| + }
|
| + arguments->SetString("signed-cert-timestamps-tls-ext", b64_scts_tls_ext);
|
| }
|
| + if (ssl_options_.staple_ocsp_response)
|
| + arguments->Set("staple-ocsp-response", base::Value::CreateNullValue());
|
| }
|
|
|
| return GenerateAdditionalArguments(arguments);
|
|
|