| Index: net/test/spawned_test_server/base_test_server.cc
|
| diff --git a/net/test/spawned_test_server/base_test_server.cc b/net/test/spawned_test_server/base_test_server.cc
|
| index 016c9301edf69ee18bbed20f2805567b0d26eeff..44fa5588a7f99c537ab80069c37acb4cb62fb904 100644
|
| --- a/net/test/spawned_test_server/base_test_server.cc
|
| +++ b/net/test/spawned_test_server/base_test_server.cc
|
| @@ -148,7 +148,8 @@ const char BaseTestServer::kLocalhost[] = "127.0.0.1";
|
| BaseTestServer::BaseTestServer(Type type, const std::string& host)
|
| : type_(type),
|
| started_(false),
|
| - log_to_console_(false) {
|
| + log_to_console_(false),
|
| + ws_basic_auth_(false) {
|
| Init(host);
|
| }
|
|
|
| @@ -156,7 +157,8 @@ BaseTestServer::BaseTestServer(Type type, const SSLOptions& ssl_options)
|
| : ssl_options_(ssl_options),
|
| type_(type),
|
| started_(false),
|
| - log_to_console_(false) {
|
| + log_to_console_(false),
|
| + ws_basic_auth_(false) {
|
| DCHECK(UsingSSL(type));
|
| Init(GetHostname(type, ssl_options));
|
| }
|
| @@ -367,6 +369,11 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const {
|
| if (VLOG_IS_ON(1) || log_to_console_)
|
| arguments->Set("log-to-console", base::Value::CreateNullValue());
|
|
|
| + if (ws_basic_auth_) {
|
| + DCHECK(type_ == TYPE_WS || type_ == TYPE_WSS);
|
| + arguments->Set("ws-basic-auth", base::Value::CreateNullValue());
|
| + }
|
| +
|
| if (UsingSSL(type_)) {
|
| // Check the certificate arguments of the HTTPS server.
|
| base::FilePath certificate_path(certificates_dir_);
|
|
|