Improve the TLS intolerant server testing support added in r134129

net/test/base_test_server.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/test/base_test_server.h"
 
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 41 matching lines @@
 }
 
 }  // namespace
 
 BaseTestServer::HTTPSOptions::HTTPSOptions()
     : server_certificate(CERT_OK),
       ocsp_status(OCSP_OK),
       request_client_certificate(false),
       bulk_ciphers(HTTPSOptions::BULK_CIPHER_ANY),
       record_resume(false),
-      tls_intolerant(false) {}
+      tls_intolerant(TLS_INTOLERANT_NONE) {}
 
 BaseTestServer::HTTPSOptions::HTTPSOptions(
     BaseTestServer::HTTPSOptions::ServerCertificate cert)
     : server_certificate(cert),
       request_client_certificate(false),
       bulk_ciphers(HTTPSOptions::BULK_CIPHER_ANY),
       record_resume(false),
-      tls_intolerant(false) {}
+      tls_intolerant(TLS_INTOLERANT_NONE) {}
 
 BaseTestServer::HTTPSOptions::~HTTPSOptions() {}
 
 FilePath BaseTestServer::HTTPSOptions::GetCertificateFile() const {
   switch (server_certificate) {
     case CERT_OK:
     case CERT_MISMATCHED_NAME:
       return FilePath(FILE_PATH_LITERAL("ok_cert.pem"));
     case CERT_EXPIRED:
       return FilePath(FILE_PATH_LITERAL("expired_cert.pem"));
@@ skipping 289 matching lines @@
     if (ssl_client_certs->GetSize())
       arguments->Set("ssl-client-ca", ssl_client_certs.release());
 
     // Check bulk cipher argument.
     scoped_ptr<base::ListValue> bulk_cipher_values(new base::ListValue());
     GetCiphersList(https_options_.bulk_ciphers, bulk_cipher_values.get());
     if (bulk_cipher_values->GetSize())
       arguments->Set("ssl-bulk-cipher", bulk_cipher_values.release());
     if (https_options_.record_resume)
       arguments->Set("https-record-resume", base::Value::CreateNullValue());
-    if (https_options_.tls_intolerant)
-      arguments->Set("tls-intolerant", base::Value::CreateNullValue());
+    if (https_options_.tls_intolerant != HTTPSOptions::TLS_INTOLERANT_NONE) {
+      arguments->Set("tls-intolerant",
+          base::Value::CreateIntegerValue(https_options_.tls_intolerant));
+    }
   }
   return true;
 }
 
 }  // namespace net