WebSocket test server migration on browser_tests

net/test/base_test_server.cc

Index: net/test/base_test_server.cc
diff --git a/net/test/base_test_server.cc b/net/test/base_test_server.cc
index e672f19207355171bdd30a2fe7e8ce98c8560213..461714c2f867dd126997cea97e86b37d5aed07c0 100644
--- a/net/test/base_test_server.cc
+++ b/net/test/base_test_server.cc
@@ -339,9 +339,7 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const {
   if (VLOG_IS_ON(1) || log_to_console_)
     arguments->Set("log-to-console", base::Value::CreateNullValue());
 
-  if (type_ == TYPE_HTTPS) {
-    arguments->Set("https", base::Value::CreateNullValue());
-
+  if (UsingSSL(type_)) {
     // Check the certificate arguments of the HTTPS server.
     FilePath certificate_path(certificates_dir_);
     FilePath certificate_file(ssl_options_.GetCertificateFile());
@@ -355,6 +353,11 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const {
       }
       arguments->SetString("cert-and-key-file", certificate_path.value());
     }
+  }
+
+  if (type_ == TYPE_HTTPS) {
+    // TODO(toyoshim): TYPE_WSS should support client auth, too.

[Ryan Sleevi, 2012/10/15 16:51:54]

Do you have a BUG # to track this?

+    arguments->Set("https", base::Value::CreateNullValue());
 
     std::string ocsp_arg = ssl_options_.GetOCSPArgument();
     if (!ocsp_arg.empty())