Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(335)

Unified Diff: net/websockets/websocket_frame_test.cc

Issue 1399303002: net/websockets: Convert int types from basictypes.h to the ones from stdint.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: websocket_deflate_stream.cc Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/websockets/websocket_frame_parser_test.cc ('k') | net/websockets/websocket_test_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/websockets/websocket_frame_test.cc
diff --git a/net/websockets/websocket_frame_test.cc b/net/websockets/websocket_frame_test.cc
index ac35d90342cea20185890b87d6011d13ce0aeea1..6d1fc25b97fafa4dbf09b56eae84faa01accfb49 100644
--- a/net/websockets/websocket_frame_test.cc
+++ b/net/websockets/websocket_frame_test.cc
@@ -21,7 +21,7 @@ TEST(WebSocketFrameHeaderTest, FrameLengths) {
struct TestCase {
const char* frame_header;
size_t frame_header_length;
- uint64 frame_length;
+ uint64_t frame_length;
};
static const TestCase kTests[] = {
{ "\x81\x00", 2, UINT64_C(0) },
@@ -59,7 +59,7 @@ TEST(WebSocketFrameHeaderTest, FrameLengthsWithMasking) {
struct TestCase {
const char* frame_header;
size_t frame_header_length;
- uint64 frame_length;
+ uint64_t frame_length;
};
static const TestCase kTests[] = {
{ "\x81\x80\xDE\xAD\xBE\xEF", 6, UINT64_C(0) },
@@ -179,7 +179,7 @@ TEST(WebSocketFrameHeaderTest, FinalBitAndReservedBits) {
TEST(WebSocketFrameHeaderTest, InsufficientBufferSize) {
struct TestCase {
- uint64 payload_length;
+ uint64_t payload_length;
bool masked;
size_t expected_header_size;
};
@@ -218,7 +218,7 @@ TEST(WebSocketFrameHeaderTest, InsufficientBufferSize) {
TEST(WebSocketFrameTest, MaskPayload) {
struct TestCase {
const char* masking_key;
- uint64 frame_offset;
+ uint64_t frame_offset;
const char* input;
const char* output;
size_t data_length;
« no previous file with comments | « net/websockets/websocket_frame_parser_test.cc ('k') | net/websockets/websocket_test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698