Roll Mojo to b88737ed62969ce3203085748f0d53ff4f09ba5b.

mojo/services/network/web_socket_impl.cc

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 7b1a37ecd61bb1607a31600dff76dc372dd60c0a..7dd9b239c79bb64f634e42ff397297f233cb2a46 100644
--- a/mojo/services/network/web_socket_impl.cc
+++ b/mojo/services/network/web_socket_impl.cc
@@ -25,19 +25,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.
-    COMPILE_ASSERT(static_cast<OpCode>(WebSocket::MESSAGE_TYPE_CONTINUATION) ==
+    COMPILE_ASSERT(static_cast<OpCode>(WebSocket::MessageType::CONTINUATION) ==
                        net::WebSocketFrameHeader::kOpCodeContinuation,
                    enum_values_must_match_for_opcode_continuation);
-    COMPILE_ASSERT(static_cast<OpCode>(WebSocket::MESSAGE_TYPE_TEXT) ==
+    COMPILE_ASSERT(static_cast<OpCode>(WebSocket::MessageType::TEXT) ==
                        net::WebSocketFrameHeader::kOpCodeText,
                    enum_values_must_match_for_opcode_text);
-    COMPILE_ASSERT(static_cast<OpCode>(WebSocket::MESSAGE_TYPE_BINARY) ==
+    COMPILE_ASSERT(static_cast<OpCode>(WebSocket::MessageType::BINARY) ==
                        net::WebSocketFrameHeader::kOpCodeBinary,
                    enum_values_must_match_for_opcode_binary);
     return static_cast<OpCode>(type);