WebSocket test server migration on browser_tests

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 192 matching lines @@
               "/" + path);
 }
 
 GURL BaseTestServer::GetURLWithUserAndPassword(const std::string& path,
                                            const std::string& user,
                                            const std::string& password) const {
   return GURL(GetScheme() + "://" + user + ":" + password + "@" +
               host_port_pair_.ToString() + "/" + path);
 }
 
+GURL BaseTestServer::GetAlternateURL(const std::string& path) const {
+  std::string scheme;
+  if (type_ == TYPE_WS)
+    scheme = "http";
+  else if (type_ == TYPE_WSS)
+    scheme = "https";
+  else
+    NOTREACHED();
+  return GURL(scheme + "://" + host_port_pair_.ToString() + "/" + path);
+}
+
 // static
 bool BaseTestServer::GetFilePathWithReplacements(
     const std::string& original_file_path,
     const std::vector<StringPair>& text_to_replace,
     std::string* replacement_path) {
   std::string new_file_path = original_file_path;
   bool first_query_parameter = true;
   const std::vector<StringPair>::const_iterator end = text_to_replace.end();
   for (std::vector<StringPair>::const_iterator it = text_to_replace.begin();
        it != end;
@@ skipping 109 matching lines @@
 bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const {
   DCHECK(arguments);
 
   arguments->SetString("host", host_port_pair_.host());
   arguments->SetInteger("port", host_port_pair_.port());
   arguments->SetString("data-dir", document_root_.value());
 
   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_)) {
+    if (type_ == TYPE_HTTPS)
+      arguments->Set("https", base::Value::CreateNullValue());
 
     // Check the certificate arguments of the HTTPS server.
     FilePath certificate_path(certificates_dir_);
     FilePath certificate_file(ssl_options_.GetCertificateFile());
     if (!certificate_file.value().empty()) {
       certificate_path = certificate_path.Append(certificate_file);
       if (certificate_path.IsAbsolute() &&
           !file_util::PathExists(certificate_path)) {
         LOG(ERROR) << "Certificate path " << certificate_path.value()
                    << " doesn't exist. Can't launch https server.";
@@ skipping 34 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