| 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 "net/test/base_test_server.h" | 5 #include "net/test/base_test_server.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/base64.h" | 10 #include "base/base64.h" |
| (...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 385 GetCiphersList(ssl_options_.bulk_ciphers, bulk_cipher_values.get()); | 385 GetCiphersList(ssl_options_.bulk_ciphers, bulk_cipher_values.get()); |
| 386 if (bulk_cipher_values->GetSize()) | 386 if (bulk_cipher_values->GetSize()) |
| 387 arguments->Set("ssl-bulk-cipher", bulk_cipher_values.release()); | 387 arguments->Set("ssl-bulk-cipher", bulk_cipher_values.release()); |
| 388 if (ssl_options_.record_resume) | 388 if (ssl_options_.record_resume) |
| 389 arguments->Set("https-record-resume", base::Value::CreateNullValue()); | 389 arguments->Set("https-record-resume", base::Value::CreateNullValue()); |
| 390 if (ssl_options_.tls_intolerant != SSLOptions::TLS_INTOLERANT_NONE) { | 390 if (ssl_options_.tls_intolerant != SSLOptions::TLS_INTOLERANT_NONE) { |
| 391 arguments->Set("tls-intolerant", | 391 arguments->Set("tls-intolerant", |
| 392 base::Value::CreateIntegerValue(ssl_options_.tls_intolerant)); | 392 base::Value::CreateIntegerValue(ssl_options_.tls_intolerant)); |
| 393 } | 393 } |
| 394 } | 394 } |
| 395 |
| 396 return GenerateAdditionalArguments(arguments); |
| 397 } |
| 398 |
| 399 bool BaseTestServer::GenerateAdditionalArguments( |
| 400 base::DictionaryValue* arguments) const { |
| 395 return true; | 401 return true; |
| 396 } | 402 } |
| 397 | 403 |
| 398 } // namespace net | 404 } // namespace net |
| OLD | NEW |