Revert of 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 d24e3eba489409466e0a31f482f890c7b03cfa5b..d33d71ae77463e8e571ec193ca76e7be74506c8f 100644
--- a/net/test/spawned_test_server/base_test_server.cc
+++ b/net/test/spawned_test_server/base_test_server.cc
@@ -111,14 +111,6 @@
   return true;
 }
 
-scoped_ptr<base::ListValue> GetTokenBindingParams(std::vector<int> params) {
-  scoped_ptr<base::ListValue> values(new base::ListValue());
-  for (int param : params) {
-    values->Append(new base::FundamentalValue(param));
-  }
-  return values;
-}
-
 }  // namespace
 
 BaseTestServer::SSLOptions::SSLOptions()
@@ -135,9 +127,8 @@
       staple_ocsp_response(false),
       ocsp_server_unavailable(false),
       enable_npn(false),
-      alert_after_handshake(false),
-      disable_channel_id(false),
-      disable_extended_master_secret(false) {}
+      alert_after_handshake(false) {
+}
 
 BaseTestServer::SSLOptions::SSLOptions(
     BaseTestServer::SSLOptions::ServerCertificate cert)
@@ -557,19 +548,6 @@
       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());
-      arguments->Set(
-          "token-binding-params",
-          GetTokenBindingParams(ssl_options_.supported_token_binding_params));
-    }
   }
 
   return GenerateAdditionalArguments(arguments);