Update from https://crrev.com/306655

net/quic/quic_connection_stats.h

Index: net/quic/quic_connection_stats.h
diff --git a/net/quic/quic_connection_stats.h b/net/quic/quic_connection_stats.h
index 2abdb594046c93bbfe402ae035f4c882f3f2a8ef..247d2c56e05bad33f01acd8c8ca41432af7350cd 100644
--- a/net/quic/quic_connection_stats.h
+++ b/net/quic/quic_connection_stats.h
@@ -9,6 +9,8 @@
 
 #include "base/basictypes.h"
 #include "net/base/net_export.h"
+#include "net/quic/quic_bandwidth.h"
+#include "net/quic/quic_protocol.h"
 #include "net/quic/quic_time.h"
 
 namespace net {
@@ -20,47 +22,52 @@ struct NET_EXPORT_PRIVATE QuicConnectionStats {
   NET_EXPORT_PRIVATE friend std::ostream& operator<<(
       std::ostream& os, const QuicConnectionStats& s);
 
-  uint64 bytes_sent;  // Includes retransmissions, fec.
-  uint32 packets_sent;
-  uint64 stream_bytes_sent;  // non-retransmitted bytes sent in a stream frame.
-  uint32 packets_discarded;  // Packets serialized and discarded before sending.
+  QuicByteCount bytes_sent;  // Includes retransmissions, fec.
+  QuicPacketCount packets_sent;
+  // Non-retransmitted bytes sent in a stream frame.
+  QuicByteCount stream_bytes_sent;
+  // Packets serialized and discarded before sending.
+  QuicPacketCount packets_discarded;
 
   // These include version negotiation and public reset packets, which do not
   // have sequence numbers or frame data.
-  uint64 bytes_received;  // Includes duplicate data for a stream, fec.
-  uint32 packets_received;  // Includes packets which were not processable.
-  uint32 packets_processed;  // Excludes packets which were not processable.
-  uint64 stream_bytes_received;  // Bytes received in a stream frame.
-
-  uint64 bytes_retransmitted;
-  uint32 packets_retransmitted;
-
-  uint64 bytes_spuriously_retransmitted;
-  uint32 packets_spuriously_retransmitted;
+  QuicByteCount bytes_received;  // Includes duplicate data for a stream, fec.
+  // Includes packets which were not processable.
+  QuicPacketCount packets_received;
+  // Excludes packets which were not processable.
+  QuicPacketCount packets_processed;
+  QuicByteCount stream_bytes_received;  // Bytes received in a stream frame.
+
+  QuicByteCount bytes_retransmitted;
+  QuicPacketCount packets_retransmitted;
+
+  QuicByteCount bytes_spuriously_retransmitted;
+  QuicPacketCount packets_spuriously_retransmitted;
   // Number of packets abandoned as lost by the loss detection algorithm.
-  uint32 packets_lost;
-  uint32 slowstart_packets_lost;  // Number of packets lost exiting slow start.
+  QuicPacketCount packets_lost;
+  // Number of packets lost exiting slow start.
+  QuicPacketCount slowstart_packets_lost;
 
-  uint32 packets_revived;
-  uint32 packets_dropped;  // Duplicate or less than least unacked.
+  QuicPacketCount packets_revived;
+  QuicPacketCount packets_dropped;  // Duplicate or less than least unacked.
   uint32 crypto_retransmit_count;
   // Count of times the loss detection alarm fired.  At least one packet should
   // be lost when the alarm fires.
   uint32 loss_timeout_count;
-  uint32 tlp_count;
-  uint32 rto_count;  // Count of times the rto timer fired.
-  uint32 spurious_rto_count;
+  size_t tlp_count;
+  size_t rto_count;  // Count of times the rto timer fired.
+  size_t spurious_rto_count;
 
   int64 min_rtt_us;  // Minimum RTT in microseconds.
   int64 srtt_us;  // Smoothed RTT in microseconds.
-  uint32 max_packet_size;  // In bytes.
-  uint64 estimated_bandwidth;  // In bytes per second.
+  QuicByteCount max_packet_size;
+  QuicBandwidth estimated_bandwidth;
 
   // Reordering stats for received packets.
   // Number of packets received out of sequence number order.
-  uint32 packets_reordered;
+  QuicPacketCount packets_reordered;
   // Maximum reordering observed in sequence space.
-  uint32 max_sequence_reordering;
+  QuicPacketSequenceNumber max_sequence_reordering;
   // Maximum reordering observed in microseconds
   int64 max_time_reordering_us;
 
@@ -69,9 +76,9 @@ struct NET_EXPORT_PRIVATE QuicConnectionStats {
   // one or more lost packets.
   uint32 tcp_loss_events;
   // Total amount of cwnd increase by TCPCubic in congestion avoidance.
-  uint32 cwnd_increase_congestion_avoidance;
+  QuicPacketCount cwnd_increase_congestion_avoidance;
   // Total amount of cwnd increase by TCPCubic in cubic mode.
-  uint32 cwnd_increase_cubic_mode;
+  QuicPacketCount cwnd_increase_cubic_mode;
 
   // Creation time, as reported by the QuicClock.
   QuicTime connection_creation_time;