Revert of Add flags to python test server for channel id, extended master secret, and token binding (patchset #2 id:20001 of https://codereview.chromium.org/1347503002/ )

Reason for revert:
This change tripped the Linux Tests (valgrind) memory bots.

See: http://build.chromium.org/p/chromium.memory.fyi/builders/Linux%20Tests%20(valgrind)(1)

First failure:
http://build.chromium.org/p/chromium.memory.fyi/builders/Linux%20Tests%20%28valgrind%29%281%29/builds/43655

Cause:
Newly added member variables are not initialized in second constructor.

Thanks and sorry for revert.

Original issue's description:
> Add flags to python test server for channel id, extended master secret, and token binding
>
> BUG=467312
>
> Committed: https://crrev.com/22e67634e17914c5dddc6ad2649a4bf701908311
> Cr-Commit-Position: refs/heads/master@{#349164}

TBR=davidben@chromium.org,rsleevi@chromium.org,nharper@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=467312

Review URL: https://codereview.chromium.org/1351133002

Cr-Commit-Position: refs/heads/master@{#349439}

3 files changed, 4 insertions, 50 deletions

diff --git a/net/test/spawned_test_server/base_test_server.cc b/net/test/spawned_test_server/base_test_server.cc
index d24e3eb..d33d71a 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 @@ bool GetLocalCertificatesDir(const base::FilePath& certificates_dir,
   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 @@ BaseTestServer::SSLOptions::SSLOptions()
       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 @@ 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());
-      arguments->Set(
-          "token-binding-params",
-          GetTokenBindingParams(ssl_options_.supported_token_binding_params));
-    }
   }
 
   return GenerateAdditionalArguments(arguments);
diff --git a/net/test/spawned_test_server/base_test_server.h b/net/test/spawned_test_server/base_test_server.h
index 5a5cc82..8204dc1 100644
--- a/net/test/spawned_test_server/base_test_server.h
+++ b/net/test/spawned_test_server/base_test_server.h
@@ -223,15 +223,6 @@ class BaseTestServer {
 
     // Whether to send a fatal alert immediately after completing the handshake.
     bool alert_after_handshake;
-
-    // If true, disables channel ID on the server.
-    bool disable_channel_id;
-
-    // If true, disables extended master secret tls extension.
-    bool disable_extended_master_secret;
-
-    // List of token binding params that the server supports and will negotiate.
-    std::vector<int> supported_token_binding_params;
   };
 
   // Pass as the 'host' parameter during construction to server on 127.0.0.1
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py
index 99684c8..ad1a57d 100755
--- a/net/tools/testserver/testserver.py
+++ b/net/tools/testserver/testserver.py
@@ -158,8 +158,7 @@ class HTTPSServer(tlslite.api.TLSSocketServerMixIn,
                record_resume_info, tls_intolerant,
                tls_intolerance_type, signed_cert_timestamps,
                fallback_scsv_enabled, ocsp_response,
-               alert_after_handshake, disable_channel_id, disable_ems,
-               token_binding_params):
+               alert_after_handshake):
     self.cert_chain = tlslite.api.X509CertChain()
     self.cert_chain.parsePemList(pem_cert_and_key)
     # Force using only python implementation - otherwise behavior is different
@@ -205,12 +204,6 @@ class HTTPSServer(tlslite.api.TLSSocketServerMixIn,
       self.ssl_handshake_settings.tlsIntoleranceType = tls_intolerance_type
     if alert_after_handshake:
       self.ssl_handshake_settings.alertAfterHandshake = True
-    if disable_channel_id:
-      self.ssl_handshake_settings.enableChannelID = False
-    if disable_ems:
-      self.ssl_handshake_settings.enableExtendedMasterSecret = False
-    self.ssl_handshake_settings.supportedTokenBindingParams = \
-        token_binding_params
 
     if record_resume_info:
       # If record_resume_info is true then we'll replace the session cache with
@@ -2064,10 +2057,7 @@ class ServerRunner(testserver_base.TestServerRunner):
                                  "base64"),
                              self.options.fallback_scsv,
                              stapled_ocsp_response,
-                             self.options.alert_after_handshake,
-                             self.options.disable_channel_id,
-                             self.options.disable_extended_master_secret,
-                             self.options.token_binding_params)
+                             self.options.alert_after_handshake)
         print 'HTTPS server started on https://%s:%d...' % \
             (host, server.server_port)
       else:
@@ -2313,11 +2303,6 @@ class ServerRunner(testserver_base.TestServerRunner):
                                   default=False, action='store_true',
                                   help='If set, the FTP server will not create '
                                   'an anonymous user.')
-    self.option_parser.add_option('--disable-channel-id', action='store_true')
-    self.option_parser.add_option('--disable-extended-master-secret',
-                                  action='store_true')
-    self.option_parser.add_option('--token-binding-params', action='append',
-                                  default=[], type='int')
 
 
 if __name__ == '__main__':