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.h

 // Copyright 2013 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.
 
 #ifndef NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_
 #define NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 205 matching lines @@
 
     // Whether to make the OCSP server unavailable. This does not affect the
     // stapled OCSP response.
     bool ocsp_server_unavailable;
 
     // Whether to enable NPN support.
     bool enable_npn;
 
     // 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
   static const char kLocalhost[];
 
   // Initialize a TestServer listening on a specific host (IP or hostname).
   BaseTestServer(Type type,  const std::string& host);
 
   // Initialize a TestServer with a specific set of SSLOptions for HTTPS or WSS.
   BaseTestServer(Type type, const SSLOptions& ssl_options);
@@ skipping 113 matching lines @@
   bool no_anonymous_ftp_user_;
 
   scoped_ptr<ScopedPortException> allowed_port_;
 
   DISALLOW_COPY_AND_ASSIGN(BaseTestServer);
 };
 
 }  // namespace net
 
 #endif  // NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_