Revert 156742 - Launch pywebsocket via net::TestServer

net/test/base_test_server.cc

Index: net/test/base_test_server.cc
===================================================================
--- net/test/base_test_server.cc	(revision 156770)
+++ net/test/base_test_server.cc	(working copy)
@@ -29,7 +29,8 @@
 
 std::string GetHostname(BaseTestServer::Type type,
                         const BaseTestServer::SSLOptions& options) {
-  if (BaseTestServer::UsingSSL(type) &&
+  if ((type == BaseTestServer::TYPE_HTTPS ||
+       type == BaseTestServer::TYPE_WSS) &&
       options.server_certificate ==
           BaseTestServer::SSLOptions::CERT_MISMATCHED_NAME) {
     // Return a different hostname string that resolves to the same hostname.
@@ -126,7 +127,7 @@
       type_(type),
       started_(false),
       log_to_console_(false) {
-  DCHECK(UsingSSL(type));
+  DCHECK(type == TYPE_HTTPS || type == TYPE_WSS);
   Init(GetHostname(type, ssl_options));
 }
 
@@ -308,7 +309,7 @@
 bool BaseTestServer::SetupWhenServerStarted() {
   DCHECK(host_port_pair_.port());
 
-  if (UsingSSL(type_) && !LoadTestRootCert())
+  if ((type_ == TYPE_HTTPS || type_ == TYPE_WSS) && !LoadTestRootCert())
       return false;
 
   started_ = true;
Property changes on: net/test/base_test_server.cc
___________________________________________________________________
Added: svn:mergeinfo