Update from https://crrev.com/312398

net/socket/socks_client_socket.cc

Index: net/socket/socks_client_socket.cc
diff --git a/net/socket/socks_client_socket.cc b/net/socket/socks_client_socket.cc
index ecf717f2a88f5184d8344d4c01e9b1b254bafde0..75eb36a76d73d8a9b6968ea6b31810a2d6effd22 100644
--- a/net/socket/socks_client_socket.cc
+++ b/net/socket/socks_client_socket.cc
@@ -44,8 +44,8 @@ struct SOCKS4ServerRequest {
   uint16 nw_port;
   uint8 ip[4];
 };
-COMPILE_ASSERT(sizeof(SOCKS4ServerRequest) == kWriteHeaderSize,
-               socks4_server_request_struct_wrong_size);
+static_assert(sizeof(SOCKS4ServerRequest) == kWriteHeaderSize,
+              "socks4 server request struct has incorrect size");
 
 // A struct holding details of the SOCKS4 Server Response.
 struct SOCKS4ServerResponse {
@@ -54,8 +54,8 @@ struct SOCKS4ServerResponse {
   uint16 port;
   uint8 ip[4];
 };
-COMPILE_ASSERT(sizeof(SOCKS4ServerResponse) == kReadHeaderSize,
-               socks4_server_response_struct_wrong_size);
+static_assert(sizeof(SOCKS4ServerResponse) == kReadHeaderSize,
+              "socks4 server response struct has incorrect size");
 
 SOCKSClientSocket::SOCKSClientSocket(
     scoped_ptr<ClientSocketHandle> transport_socket,