Switch to static_assert.

components/html_viewer/web_socket_handle_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 "components/html_viewer/web_socket_handle_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
@@ skipping 22 matching lines @@
 
 namespace mojo {
 
 template<>
 struct TypeConverter<WebSocket::MessageType, WebSocketHandle::MessageType> {
   static WebSocket::MessageType Convert(WebSocketHandle::MessageType type) {
     DCHECK(type == WebSocketHandle::MessageTypeContinuation ||
            type == WebSocketHandle::MessageTypeText ||
            type == WebSocketHandle::MessageTypeBinary);
     typedef WebSocket::MessageType MessageType;
-    COMPILE_ASSERT(
+    static_assert(
         static_cast<MessageType>(WebSocketHandle::MessageTypeContinuation) ==
             WebSocket::MESSAGE_TYPE_CONTINUATION,
-        enum_values_must_match_for_message_type);
-    COMPILE_ASSERT(
-        static_cast<MessageType>(WebSocketHandle::MessageTypeText) ==
-            WebSocket::MESSAGE_TYPE_TEXT,
-        enum_values_must_match_for_message_type);
-    COMPILE_ASSERT(
+        "WebSocket and WebSocketHandle enum values must match");
+    static_assert(static_cast<MessageType>(WebSocketHandle::MessageTypeText) ==
+                      WebSocket::MESSAGE_TYPE_TEXT,
+                  "WebSocket and WebSocketHandle enum values must match");
+    static_assert(
         static_cast<MessageType>(WebSocketHandle::MessageTypeBinary) ==
             WebSocket::MESSAGE_TYPE_BINARY,
-        enum_values_must_match_for_message_type);
+        "WebSocket and WebSocketHandle enum values must match");
     return static_cast<WebSocket::MessageType>(type);
   }
 };
 
 template<>
 struct TypeConverter<WebSocketHandle::MessageType, WebSocket::MessageType> {
   static WebSocketHandle::MessageType Convert(WebSocket::MessageType type) {
     DCHECK(type == WebSocket::MESSAGE_TYPE_CONTINUATION ||
            type == WebSocket::MESSAGE_TYPE_TEXT ||
            type == WebSocket::MESSAGE_TYPE_BINARY);
@@ skipping 151 matching lines @@
     const char* data) {
   web_socket_->Send(fin, ConvertTo<WebSocket::MessageType>(type), num_bytes);
 }
 
 void WebSocketHandleImpl::Disconnect() {
   did_close_ = true;
   client_.reset();
 }
 
 }  // namespace html_viewer