net/websockets: Use the (U)INTx_{MIN,MAX} macros from stdint.h

net/websockets/websocket_frame.cc

 // Copyright (c) 2012 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 "net/websockets/websocket_frame.h"
 
 #include <stddef.h>
-#include <stdint.h>

[wtc, 2015/10/13 23:31:35]

IMPORTANT: did you intend to remove <stdint.h> here?

[tfarina, 2015/10/13 23:35:53]

Yes, it is in the header file already.

-
 #include <algorithm>
 
-#include "base/basictypes.h"
 #include "base/big_endian.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 
 namespace net {
 
 namespace {
 
@@ skipping 57 matching lines @@
 
 WebSocketFrame::~WebSocketFrame() {}
 
 WebSocketFrameChunk::WebSocketFrameChunk() : final_chunk(false) {}
 
 WebSocketFrameChunk::~WebSocketFrameChunk() {}
 
 int GetWebSocketFrameHeaderSize(const WebSocketFrameHeader& header) {
   int extended_length_size = 0;
   if (header.payload_length > kMaxPayloadLengthWithoutExtendedLengthField &&
-      header.payload_length <= kuint16max) {
+      header.payload_length <= UINT16_MAX) {
     extended_length_size = 2;
-  } else if (header.payload_length > kuint16max) {
+  } else if (header.payload_length > UINT16_MAX) {
     extended_length_size = 8;
   }
 
   return (WebSocketFrameHeader::kBaseHeaderSize + extended_length_size +
           (header.masked ? WebSocketFrameHeader::kMaskingKeyLength : 0));
 }
 
 int WriteWebSocketFrameHeader(const WebSocketFrameHeader& header,
                               const WebSocketMaskingKey* masking_key,
                               char* buffer,
                               int buffer_size) {
   DCHECK((header.opcode & kOpCodeMask) == header.opcode)
       << "header.opcode must fit to kOpCodeMask.";
-  DCHECK(header.payload_length <= static_cast<uint64_t>(kint64max))
+  DCHECK(header.payload_length <= static_cast<uint64_t>(INT64_MAX))
       << "WebSocket specification doesn't allow a frame longer than "
-      << "kint64max (0x7FFFFFFFFFFFFFFF) bytes.";
+      << "INT64_MAX (0x7FFFFFFFFFFFFFFF) bytes.";
   DCHECK_GE(buffer_size, 0);
 
   // WebSocket frame format is as follows:
   // - Common header (2 bytes)
   // - Optional extended payload length
   //   (2 or 8 bytes, present if actual payload length is more than 125 bytes)
   // - Optional masking key (4 bytes, present if MASK bit is on)
   // - Actual payload (XOR masked with masking key if MASK bit is on)
   //
   // This function constructs frame header (the first three in the list
@@ skipping 11 matching lines @@
   first_byte |= header.reserved2 ? kReserved2Bit : 0u;
   first_byte |= header.reserved3 ? kReserved3Bit : 0u;
   first_byte |= header.opcode & kOpCodeMask;
   buffer[buffer_index++] = first_byte;
 
   int extended_length_size = 0;
   uint8_t second_byte = 0u;
   second_byte |= header.masked ? kMaskBit : 0u;
   if (header.payload_length <= kMaxPayloadLengthWithoutExtendedLengthField) {
     second_byte |= header.payload_length;
-  } else if (header.payload_length <= kuint16max) {
+  } else if (header.payload_length <= UINT16_MAX) {
     second_byte |= kPayloadLengthWithTwoByteExtendedLengthField;
     extended_length_size = 2;
   } else {
     second_byte |= kPayloadLengthWithEightByteExtendedLengthField;
     extended_length_size = 8;
   }
   buffer[buffer_index++] = second_byte;
 
   // Writes "extended payload length" field.
   if (extended_length_size == 2) {
@@ skipping 95 matching lines @@
   }
 
   MaskWebSocketFramePayloadByBytes(
       masking_key,
       (frame_offset + (aligned_end - data)) % kMaskingKeyLength,
       aligned_end,
       end);
 }
 
 }  // namespace net