Use validating IPC enum macros in websocket messages

content/common/websocket_messages.h

 // Copyright 2013 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.
 
 // Multiply-included message file, hence no include guard.
 
 // This file defines the IPCs for the browser-side implementation of
 // WebSockets. For the legacy renderer-side implementation, see
 // socket_stream_messages.h.
 // TODO(ricea): Fix this comment when the legacy implementation has been
 // removed.
 //
 // This IPC interface is based on the WebSocket multiplexing draft spec,
 // http://tools.ietf.org/html/draft-ietf-hybi-websocket-multiplexing-09
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "content/common/content_export.h"
 #include "content/common/websocket.h"
 #include "ipc/ipc_message_macros.h"
 #include "url/gurl.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 #define IPC_MESSAGE_START WebSocketMsgStart
 
+IPC_ENUM_TRAITS_MAX_VALUE(content::WebSocketMessageType,
+                          content::WEB_SOCKET_MESSAGE_TYPE_LAST)
+
 IPC_STRUCT_TRAITS_BEGIN(content::WebSocketHandshakeRequest)
   IPC_STRUCT_TRAITS_MEMBER(url)
   IPC_STRUCT_TRAITS_MEMBER(headers)
   IPC_STRUCT_TRAITS_MEMBER(request_time)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(content::WebSocketHandshakeResponse)
   IPC_STRUCT_TRAITS_MEMBER(url)
   IPC_STRUCT_TRAITS_MEMBER(status_code)
   IPC_STRUCT_TRAITS_MEMBER(status_text)
@@ skipping 55 matching lines @@
 // 3. Close the channel immediately uncleanly, as if it received
 //    DropChannel(was_clean = false, code = 1006, reason = "").
 // |message| will be shown in the inspector and won't be passed to the script.
 // TODO(yhirano): Find the way to pass |message| directly to the inspector
 // process.
 IPC_MESSAGE_ROUTED1(WebSocketMsg_NotifyFailure,
                     std::string /* message */)
 
 // WebSocket messages that can be sent in either direction.
 
-IPC_ENUM_TRAITS(content::WebSocketMessageType)
-
 // Send a non-control frame on |channel_id|. If the sender is the renderer, it
 // will be sent to the remote server. If the sender is the browser, it comes
 // from the remote server. |fin| indicates that this frame is the last in the
 // current message. |type| is the type of the message. On the first frame of a
 // message, it must be set to either WEB_SOCKET_MESSAGE_TYPE_TEXT or
 // WEB_SOCKET_MESSAGE_TYPE_BINARY. On subsequent frames, it must be set to
 // WEB_SOCKET_MESSAGE_TYPE_CONTINUATION, and the type is the same as that of the
 // first message. If |type| is WEB_SOCKET_MESSAGE_TYPE_TEXT, then the
 // concatenation of the |data| from every frame in the message must be valid
 // UTF-8. If |fin| is not set, |data| must be non-empty.
@@ skipping 26 matching lines @@
 // message.
 // If |was_clean| is false on a message from the browser, then the WebSocket
 // connection was not closed cleanly. If |was_clean| is false on a message from
 // the renderer, then the connection should be closed immediately without a
 // closing handshake and the renderer cannot accept any new messages on this
 // connection.
 IPC_MESSAGE_ROUTED3(WebSocketMsg_DropChannel,
                     bool /* was_clean */,
                     unsigned short /* code */,
                     std::string /* reason */)