Roll Mojo to b88737ed62969ce3203085748f0d53ff4f09ba5b.

mojo/services/network/web_socket_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/services/network/web_socket_impl.h"
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/common/handle_watcher.h"
 #include "mojo/services/network/network_context.h"
 #include "mojo/services/network/public/cpp/web_socket_read_queue.h"
 #include "mojo/services/network/public/cpp/web_socket_write_queue.h"
 #include "net/websockets/websocket_channel.h"
 #include "net/websockets/websocket_errors.h"
 #include "net/websockets/websocket_event_interface.h"
 #include "net/websockets/websocket_frame.h"  // for WebSocketFrameHeader::OpCode
 #include "net/websockets/websocket_handshake_request_info.h"
 #include "net/websockets/websocket_handshake_response_info.h"
 #include "url/origin.h"
 
 namespace mojo {
 
 template <>
 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);
   }
 };
 
 template <>
 struct TypeConverter<WebSocket::MessageType,
                      net::WebSocketFrameHeader::OpCode> {
   static WebSocket::MessageType Convert(
@@ skipping 176 matching lines @@
                                           uint32_t num_bytes,
                                           const char* data) {
   std::vector<char> buffer(num_bytes);
   memcpy(&buffer[0], data, num_bytes);
   DCHECK(channel_);
   channel_->SendFrame(
       fin, ConvertTo<net::WebSocketFrameHeader::OpCode>(type), buffer);
 }
 
 }  // namespace mojo