Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(387)

Unified Diff: trunk/src/net/test/spawned_test_server/base_test_server.cc

Issue 388493002: Revert 282307 "Map WebSocket URL schemes to HTTP URL schemes for..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/net/test/spawned_test_server/base_test_server.cc
===================================================================
--- trunk/src/net/test/spawned_test_server/base_test_server.cc (revision 282330)
+++ trunk/src/net/test/spawned_test_server/base_test_server.cc (working copy)
@@ -165,8 +165,7 @@
BaseTestServer::BaseTestServer(Type type, const std::string& host)
: type_(type),
started_(false),
- log_to_console_(false),
- ws_basic_auth_(false) {
+ log_to_console_(false) {
Init(host);
}
@@ -174,8 +173,7 @@
: ssl_options_(ssl_options),
type_(type),
started_(false),
- log_to_console_(false),
- ws_basic_auth_(false) {
+ log_to_console_(false) {
DCHECK(UsingSSL(type));
Init(GetHostname(type, ssl_options));
}
@@ -386,11 +384,6 @@
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_);
« no previous file with comments | « trunk/src/net/test/spawned_test_server/base_test_server.h ('k') | trunk/src/net/tools/testserver/testserver.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698