Revert 156742 - Launch pywebsocket via net::TestServer

net/test/base_test_server.cc

 // Copyright (c) 2012 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.
 
 #include "net/test/base_test_server.h"
 
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 11 matching lines @@
 #include "net/base/net_util.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/test_root_certs.h"
 
 namespace net {
 
 namespace {
 
 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.
     return "localhost";
   }
 
   // Use the 127.0.0.1 as default.
   return BaseTestServer::kLocalhost;
 }
 
@@ skipping 76 matching lines @@
       started_(false),
       log_to_console_(false) {
   Init(host);
 }
 
 BaseTestServer::BaseTestServer(Type type, const SSLOptions& ssl_options)
     : ssl_options_(ssl_options),
       type_(type),
       started_(false),
       log_to_console_(false) {
-  DCHECK(UsingSSL(type));
+  DCHECK(type == TYPE_HTTPS || type == TYPE_WSS);
   Init(GetHostname(type, ssl_options));
 }
 
 BaseTestServer::~BaseTestServer() {}
 
 const HostPortPair& BaseTestServer::host_port_pair() const {
   DCHECK(started_);
   return host_port_pair_;
 }
 
@@ skipping 161 matching lines @@
     root_certificate_path = src_dir.Append(certificates_dir_);
   }
 
   return root_certs->AddFromFile(
       root_certificate_path.AppendASCII("root_ca_cert.crt"));
 }
 
 bool BaseTestServer::SetupWhenServerStarted() {
   DCHECK(host_port_pair_.port());
 
-  if (UsingSSL(type_) && !LoadTestRootCert())
+  if ((type_ == TYPE_HTTPS || type_ == TYPE_WSS) && !LoadTestRootCert())
       return false;
 
   started_ = true;
   allowed_port_.reset(new ScopedPortException(host_port_pair_.port()));
   return true;
 }
 
 void BaseTestServer::CleanUpWhenStoppingServer() {
   TestRootCerts* root_certs = TestRootCerts::GetInstance();
   root_certs->Clear();
@@ skipping 66 matching lines @@
       arguments->Set("https-record-resume", base::Value::CreateNullValue());
     if (ssl_options_.tls_intolerant != SSLOptions::TLS_INTOLERANT_NONE) {
       arguments->Set("tls-intolerant",
           base::Value::CreateIntegerValue(ssl_options_.tls_intolerant));
     }
   }
   return true;
 }
 
 }  // namespace net