Land Recent QUIC Changes

net/quic/quic_connection_stats.cc

Index: net/quic/quic_connection_stats.cc
diff --git a/net/quic/quic_connection_stats.cc b/net/quic/quic_connection_stats.cc
index 324ea4225db711250e5a89af613cbf3eae05e3fb..284ecceb71aadf22696255bf8b5142bcd658a9dc 100644
--- a/net/quic/quic_connection_stats.cc
+++ b/net/quic/quic_connection_stats.cc
@@ -27,8 +27,8 @@ QuicConnectionStats::QuicConnectionStats()
       rto_count(0),
       rtt(0),
       estimated_bandwidth(0),
-      cwnd_increase_cubic_mode(0),
-      cwnd_increase_reno_mode(0) {
+      cwnd_increase_congestion_avoidance(0),
+      cwnd_increase_cubic_mode(0) {
 }
 
 QuicConnectionStats::~QuicConnectionStats() {}
@@ -52,10 +52,10 @@ ostream& operator<<(ostream& os, const QuicConnectionStats& s) {
      << ", tlp count: " << s.tlp_count
      << ", rtt(us): " << s.rtt
      << ", estimated_bandwidth: " << s.estimated_bandwidth
+     << ", total amount of cwnd increase in TCPCubic, in congestion avoidance: "
+     << s.cwnd_increase_congestion_avoidance
      << ", amount of cwnd increase in TCPCubic, in cubic mode: "
      << s.cwnd_increase_cubic_mode
-     << ", amount of cwnd increase in TCPCubic, matched by or in reno mode: "
-     << s.cwnd_increase_reno_mode
      << "}\n";
   return os;
 }