Landing Recent QUIC changes until 4AM, Aug 7, 2016 UTC-4

net/quic/core/quic_crypto_stream.cc

Index: net/quic/core/quic_crypto_stream.cc
diff --git a/net/quic/core/quic_crypto_stream.cc b/net/quic/core/quic_crypto_stream.cc
index cffd838047fd1c8df281aae2a43c7996253da8bc..879834d3c15be0ef4f83d60f75f05afc3fef2eaf 100644
--- a/net/quic/core/quic_crypto_stream.cc
+++ b/net/quic/core/quic_crypto_stream.cc
@@ -33,6 +33,17 @@ QuicCryptoStream::QuicCryptoStream(QuicSession* session)
   DisableConnectionFlowControlForThisStream();
 }
 
+// static
+QuicByteCount QuicCryptoStream::CryptoMessageFramingOverhead(
+    QuicVersion version) {
+  return QuicPacketCreator::StreamFramePacketOverhead(
+      version, PACKET_8BYTE_CONNECTION_ID,
+      /*include_version=*/true,
+      /*include_path_id=*/true,
+      /*include_diversification_nonce=*/true, PACKET_1BYTE_PACKET_NUMBER,
+      /*offset=*/0);
+}
+
 void QuicCryptoStream::OnError(CryptoFramer* framer) {
   DLOG(WARNING) << "Error processing crypto data: "
                 << QuicUtils::ErrorToString(framer->error());