Landing Recent QUIC changes until Sat Aug 13 04:32:36 2016 UTC-0

net/quic/core/quic_framer_test.cc

Index: net/quic/core/quic_framer_test.cc
diff --git a/net/quic/core/quic_framer_test.cc b/net/quic/core/quic_framer_test.cc
index 922ed4ca474e84d14f3a3446035a100409c53d74..dd49260ddbf4b55621f6843bfc842df005b3d90a 100644
--- a/net/quic/core/quic_framer_test.cc
+++ b/net/quic/core/quic_framer_test.cc
@@ -4,7 +4,7 @@
 
 #include "net/quic/core/quic_framer.h"
 
-#include <stdint.h>
+#include <string.h>
 
 #include <algorithm>
 #include <map>
@@ -642,7 +642,7 @@ TEST_P(QuicFramerTest, LargePacket) {
   memset(packet + header_size, 0, kMaxPacketSize - header_size);
 
   QuicEncryptedPacket encrypted(AsChars(packet), arraysize(packet), false);
-  EXPECT_DFATAL(framer_.ProcessPacket(encrypted), "Packet too large:1");
+  EXPECT_QUIC_BUG(framer_.ProcessPacket(encrypted), "Packet too large:1");
 
   ASSERT_TRUE(visitor_.header_.get());
   // Make sure we've parsed the packet header, so we can send an error.