Landing recent QUIC changes until Sun Mar 5 09:18:09 2017 +0000

net/quic/core/quic_transmission_info.h

Index: net/quic/core/quic_transmission_info.h
diff --git a/net/quic/core/quic_transmission_info.h b/net/quic/core/quic_transmission_info.h
index 6529f4ec971829ea5db5c8fee6fc53b0c37f1869..1dee816bc4d5c2f03d07abb7a963fd767eb510ca 100644
--- a/net/quic/core/quic_transmission_info.h
+++ b/net/quic/core/quic_transmission_info.h
@@ -58,6 +58,11 @@ struct QUIC_EXPORT_PRIVATE QuicTransmissionInfo {
   // The largest_acked in the ack frame, if the packet contains an ack.
   QuicPacketNumber largest_acked;
 };
+// TODO(ianswett): Add static_assert when size of this struct is reduced below
+// 64 bytes.
+// NOTE(vlovich): Existing static_assert removed because padding differences on
+// 64-bit iOS resulted in an 88-byte struct that is greater than the 84-byte
+// limit on other platforms.  Removing per ianswett's request.
 
 }  // namespace net