Land Recent QUIC Changes

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 d2ff52a4a1f9caf88aa55c2dabbc4cf0e5130ce7..dffae312c5da8e87d52c7ce56bf508f18eee6828 100644
--- a/net/quic/quic_connection_stats.h
+++ b/net/quic/quic_connection_stats.h
@@ -55,12 +55,10 @@ struct NET_EXPORT_PRIVATE QuicConnectionStats {
   uint64 estimated_bandwidth;
 
   // The following stats are used only in TcpCubicSender.
+  // Total amount of cwnd increase by TCPCubic in congestion avoidance.
+  uint32 cwnd_increase_congestion_avoidance;
   // Total amount of cwnd increase by TCPCubic in cubic mode.
   uint32 cwnd_increase_cubic_mode;
-  // Total amount of cwnd increase by TCPCubic in reno mode. This includes
-  // cwnd increases that actually happened in cubic mode, but where reno mode
-  // would have yielded the same increase.
-  uint32 cwnd_increase_reno_mode;
   // TODO(satyamshekhar): Add window_size, mss and mtu.
 };