Add flags to python test server for channel id, extended master secret, and token binding

net/test/spawned_test_server/base_test_server.cc

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 d33d71ae77463e8e571ec193ca76e7be74506c8f..8613d0d1a897342543c556098f7776cf4b378822 100644
--- a/net/test/spawned_test_server/base_test_server.cc
+++ b/net/test/spawned_test_server/base_test_server.cc
@@ -111,6 +111,12 @@ bool GetLocalCertificatesDir(const base::FilePath& certificates_dir,
   return true;
 }
 
+void GetTokenBindingParams(std::vector<int> params, base::ListValue* values) {

[davidben, 2015/09/15 15:58:35]

Perhaps just have this return a scoped_ptr<base::ListValue>? Would probably be
slightly cleaner at the call site and right now this is more
"AppendTokenBindingParams".

(DictonaryValue has a scoped_ptr<Value> version of Set so you don't need to
.release() or anything.)

[nharper, 2015/09/15 23:49:19]

Done.

+  for (int param : params) {
+    values->Append(new base::FundamentalValue(param));
+  }
+}
+
 }  // namespace
 
 BaseTestServer::SSLOptions::SSLOptions()
@@ -127,8 +133,9 @@ BaseTestServer::SSLOptions::SSLOptions()
       staple_ocsp_response(false),
       ocsp_server_unavailable(false),
       enable_npn(false),
-      alert_after_handshake(false) {
-}
+      alert_after_handshake(false),
+      disable_channel_id(false),
+      disable_extended_master_secret(false) {}
 
 BaseTestServer::SSLOptions::SSLOptions(
     BaseTestServer::SSLOptions::ServerCertificate cert)
@@ -548,6 +555,19 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const {
       arguments->Set("enable-npn", base::Value::CreateNullValue());
     if (ssl_options_.alert_after_handshake)
       arguments->Set("alert-after-handshake", base::Value::CreateNullValue());
+
+    if (ssl_options_.disable_channel_id)
+      arguments->Set("disable-channel-id", base::Value::CreateNullValue());
+    if (ssl_options_.disable_extended_master_secret) {
+      arguments->Set("disable-extended-master-secret",
+                     base::Value::CreateNullValue());
+    }
+    if (!ssl_options_.supported_token_binding_params.empty()) {
+      scoped_ptr<base::ListValue> token_binding_params(new base::ListValue());
+      GetTokenBindingParams(ssl_options_.supported_token_binding_params,
+                            token_binding_params.get());
+      arguments->Set("token-binding-params", token_binding_params.release());
+    }
   }
 
   return GenerateAdditionalArguments(arguments);