Update monet.

net/websockets/websocket_frame_test.cc

 // 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.
 
 #include "net/websockets/websocket_frame.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/aligned_memory.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
 TEST(WebSocketFrameHeaderTest, FrameLengths) {
   struct TestCase {
     const char* frame_header;
     size_t frame_header_length;
     uint64 frame_length;
   };
   static const TestCase kTests[] = {
-    { "\x81\x00", 2, GG_UINT64_C(0) },
-    { "\x81\x7D", 2, GG_UINT64_C(125) },
-    { "\x81\x7E\x00\x7E", 4, GG_UINT64_C(126) },
-    { "\x81\x7E\xFF\xFF", 4, GG_UINT64_C(0xFFFF) },
-    { "\x81\x7F\x00\x00\x00\x00\x00\x01\x00\x00", 10, GG_UINT64_C(0x10000) },
-    { "\x81\x7F\x7F\xFF\xFF\xFF\xFF\xFF\xFF\xFF", 10,
-      GG_UINT64_C(0x7FFFFFFFFFFFFFFF) }
-  };
+      {"\x81\x00", 2, UINT64_C(0)},
+      {"\x81\x7D", 2, UINT64_C(125)},
+      {"\x81\x7E\x00\x7E", 4, UINT64_C(126)},
+      {"\x81\x7E\xFF\xFF", 4, UINT64_C(0xFFFF)},
+      {"\x81\x7F\x00\x00\x00\x00\x00\x01\x00\x00", 10, UINT64_C(0x10000)},
+      {"\x81\x7F\x7F\xFF\xFF\xFF\xFF\xFF\xFF\xFF", 10,
+       UINT64_C(0x7FFFFFFFFFFFFFFF)}};
   static const int kNumTests = arraysize(kTests);
 
   for (int i = 0; i < kNumTests; ++i) {
     WebSocketFrameHeader header(WebSocketFrameHeader::kOpCodeText);
     header.final = true;
     header.payload_length = kTests[i].frame_length;
 
     std::vector<char> expected_output(
         kTests[i].frame_header,
         kTests[i].frame_header + kTests[i].frame_header_length);
@@ skipping 10 matching lines @@
   static_assert(
       arraysize(kMaskingKey) - 1 == WebSocketFrameHeader::kMaskingKeyLength,
       "incorrect masking key size");
 
   struct TestCase {
     const char* frame_header;
     size_t frame_header_length;
     uint64 frame_length;
   };
   static const TestCase kTests[] = {
-    { "\x81\x80\xDE\xAD\xBE\xEF", 6, GG_UINT64_C(0) },
-    { "\x81\xFD\xDE\xAD\xBE\xEF", 6, GG_UINT64_C(125) },
-    { "\x81\xFE\x00\x7E\xDE\xAD\xBE\xEF", 8, GG_UINT64_C(126) },
-    { "\x81\xFE\xFF\xFF\xDE\xAD\xBE\xEF", 8, GG_UINT64_C(0xFFFF) },
-    { "\x81\xFF\x00\x00\x00\x00\x00\x01\x00\x00\xDE\xAD\xBE\xEF", 14,
-      GG_UINT64_C(0x10000) },
-    { "\x81\xFF\x7F\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xDE\xAD\xBE\xEF", 14,
-      GG_UINT64_C(0x7FFFFFFFFFFFFFFF) }
-  };
+      {"\x81\x80\xDE\xAD\xBE\xEF", 6, UINT64_C(0)},
+      {"\x81\xFD\xDE\xAD\xBE\xEF", 6, UINT64_C(125)},
+      {"\x81\xFE\x00\x7E\xDE\xAD\xBE\xEF", 8, UINT64_C(126)},
+      {"\x81\xFE\xFF\xFF\xDE\xAD\xBE\xEF", 8, UINT64_C(0xFFFF)},
+      {"\x81\xFF\x00\x00\x00\x00\x00\x01\x00\x00\xDE\xAD\xBE\xEF", 14,
+       UINT64_C(0x10000)},
+      {"\x81\xFF\x7F\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xDE\xAD\xBE\xEF", 14,
+       UINT64_C(0x7FFFFFFFFFFFFFFF)}};
   static const int kNumTests = arraysize(kTests);
 
   WebSocketMaskingKey masking_key;
   std::copy(kMaskingKey,
             kMaskingKey + WebSocketFrameHeader::kMaskingKeyLength,
             masking_key.key);
 
   for (int i = 0; i < kNumTests; ++i) {
     WebSocketFrameHeader header(WebSocketFrameHeader::kOpCodeText);
     header.final = true;
@@ skipping 92 matching lines @@
     EXPECT_EQ(expected_output, output);
   }
 }
 
 TEST(WebSocketFrameHeaderTest, InsufficientBufferSize) {
   struct TestCase {
     uint64 payload_length;
     bool masked;
     size_t expected_header_size;
   };
-  static const TestCase kTests[] = {
-    { GG_UINT64_C(0), false, 2u },
-    { GG_UINT64_C(125), false, 2u },
-    { GG_UINT64_C(126), false, 4u },
-    { GG_UINT64_C(0xFFFF), false, 4u },
-    { GG_UINT64_C(0x10000), false, 10u },
-    { GG_UINT64_C(0x7FFFFFFFFFFFFFFF), false, 10u },
-    { GG_UINT64_C(0), true, 6u },
-    { GG_UINT64_C(125), true, 6u },
-    { GG_UINT64_C(126), true, 8u },
-    { GG_UINT64_C(0xFFFF), true, 8u },
-    { GG_UINT64_C(0x10000), true, 14u },
-    { GG_UINT64_C(0x7FFFFFFFFFFFFFFF), true, 14u }
-  };
+  static const TestCase kTests[] = {{UINT64_C(0), false, 2u},
+                                    {UINT64_C(125), false, 2u},
+                                    {UINT64_C(126), false, 4u},
+                                    {UINT64_C(0xFFFF), false, 4u},
+                                    {UINT64_C(0x10000), false, 10u},
+                                    {UINT64_C(0x7FFFFFFFFFFFFFFF), false, 10u},
+                                    {UINT64_C(0), true, 6u},
+                                    {UINT64_C(125), true, 6u},
+                                    {UINT64_C(126), true, 8u},
+                                    {UINT64_C(0xFFFF), true, 8u},
+                                    {UINT64_C(0x10000), true, 14u},
+                                    {UINT64_C(0x7FFFFFFFFFFFFFFF), true, 14u}};
   static const int kNumTests = arraysize(kTests);
 
   for (int i = 0; i < kNumTests; ++i) {
     WebSocketFrameHeader header(WebSocketFrameHeader::kOpCodeText);
     header.final = true;
     header.opcode = WebSocketFrameHeader::kOpCodeText;
     header.masked = kTests[i].masked;
     header.payload_length = kTests[i].payload_length;
 
     char dummy_buffer[14];
@@ skipping 176 matching lines @@
   EXPECT_FALSE(Frame::IsKnownControlOpCode(0xF));
 
   // Check that out-of-range opcodes return false
   EXPECT_FALSE(Frame::IsKnownControlOpCode(-1));
   EXPECT_FALSE(Frame::IsKnownControlOpCode(0xFF));
 }
 
 }  // namespace
 
 }  // namespace net