| Index: mojo/services/network/web_socket_impl.cc
|
| diff --git a/mojo/services/network/web_socket_impl.cc b/mojo/services/network/web_socket_impl.cc
|
| index 9b2e8f71883e1c5a8c6203d9af52f65e0687383d..459b5317872d01b44a3240a07b98351dde7f77bb 100644
|
| --- a/mojo/services/network/web_socket_impl.cc
|
| +++ b/mojo/services/network/web_socket_impl.cc
|
| @@ -30,19 +30,19 @@ struct TypeConverter<net::WebSocketFrameHeader::OpCode,
|
| WebSocket::MessageType> {
|
| static net::WebSocketFrameHeader::OpCode Convert(
|
| WebSocket::MessageType type) {
|
| - DCHECK(type == WebSocket::MESSAGE_TYPE_CONTINUATION ||
|
| - type == WebSocket::MESSAGE_TYPE_TEXT ||
|
| - type == WebSocket::MESSAGE_TYPE_BINARY);
|
| + DCHECK(type == WebSocket::MessageType::CONTINUATION ||
|
| + type == WebSocket::MessageType::TEXT ||
|
| + type == WebSocket::MessageType::BINARY);
|
| typedef net::WebSocketFrameHeader::OpCode OpCode;
|
| // These compile asserts verify that the same underlying values are used for
|
| // both types, so we can simply cast between them.
|
| - static_assert(static_cast<OpCode>(WebSocket::MESSAGE_TYPE_CONTINUATION) ==
|
| + static_assert(static_cast<OpCode>(WebSocket::MessageType::CONTINUATION) ==
|
| net::WebSocketFrameHeader::kOpCodeContinuation,
|
| "enum values must match for opcode continuation");
|
| - static_assert(static_cast<OpCode>(WebSocket::MESSAGE_TYPE_TEXT) ==
|
| + static_assert(static_cast<OpCode>(WebSocket::MessageType::TEXT) ==
|
| net::WebSocketFrameHeader::kOpCodeText,
|
| "enum values must match for opcode text");
|
| - static_assert(static_cast<OpCode>(WebSocket::MESSAGE_TYPE_BINARY) ==
|
| + static_assert(static_cast<OpCode>(WebSocket::MessageType::BINARY) ==
|
| net::WebSocketFrameHeader::kOpCodeBinary,
|
| "enum values must match for opcode binary");
|
| return static_cast<OpCode>(type);
|
|
|