Improve the TLS intolerant server testing support added in r134129

net/test/base_test_server.cc

Index: net/test/base_test_server.cc
===================================================================
--- net/test/base_test_server.cc	(revision 138367)
+++ net/test/base_test_server.cc	(working copy)
@@ -59,7 +59,7 @@
       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)
@@ -67,7 +67,7 @@
       request_client_certificate(false),
       bulk_ciphers(HTTPSOptions::BULK_CIPHER_ANY),
       record_resume(false),
-      tls_intolerant(false) {}
+      tls_intolerant(TLS_INTOLERANT_NONE) {}
 
 BaseTestServer::HTTPSOptions::~HTTPSOptions() {}
 
@@ -377,8 +377,10 @@
       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;
 }