| Index: net/websockets/websocket_basic_handshake_stream.cc
|
| diff --git a/net/websockets/websocket_basic_handshake_stream.cc b/net/websockets/websocket_basic_handshake_stream.cc
|
| index 7bb34a335c75898f6b6de9e8e9e373542bb4c068..0831c719fb3ac60b6a347edbce374e2ecd034c78 100644
|
| --- a/net/websockets/websocket_basic_handshake_stream.cc
|
| +++ b/net/websockets/websocket_basic_handshake_stream.cc
|
| @@ -99,7 +99,7 @@ void AddVectorHeaderIfNonEmpty(const char* name,
|
| HttpRequestHeaders* headers) {
|
| if (value.empty())
|
| return;
|
| - headers->SetHeader(name, JoinString(value, ", "));
|
| + headers->SetHeader(name, base::JoinString(value, ", "));
|
| }
|
|
|
| GetHeaderResult GetSingleHeaderValue(const HttpResponseHeaders* headers,
|
| @@ -142,7 +142,7 @@ bool ValidateUpgrade(const HttpResponseHeaders* headers,
|
| return false;
|
| }
|
|
|
| - if (!LowerCaseEqualsASCII(value, websockets::kWebSocketLowercase)) {
|
| + if (!base::LowerCaseEqualsASCII(value, websockets::kWebSocketLowercase)) {
|
| *failure_message =
|
| "'Upgrade' header value is not 'WebSocket': " + value;
|
| return false;
|
| @@ -346,7 +346,7 @@ bool ValidateExtensions(const HttpResponseHeaders* headers,
|
| }
|
| }
|
| }
|
| - *accepted_extensions_descriptor = JoinString(header_values, ", ");
|
| + *accepted_extensions_descriptor = base::JoinString(header_values, ", ");
|
| return true;
|
| }
|
|
|
|
|