Land Recent QUIC Changes until 2/21/2015.

net/quic/congestion_control/cubic.cc

Index: net/quic/congestion_control/cubic.cc
diff --git a/net/quic/congestion_control/cubic.cc b/net/quic/congestion_control/cubic.cc
index dc6b89bf9d01fb5e7e0307000a7bb80509a45761..175ede610062744dc47c30424eb868ce29e94356 100644
--- a/net/quic/congestion_control/cubic.cc
+++ b/net/quic/congestion_control/cubic.cc
@@ -38,12 +38,11 @@ const float kBetaLastMax = 0.85f;
 
 }  // namespace
 
-Cubic::Cubic(const QuicClock* clock, QuicConnectionStats* stats)
+Cubic::Cubic(const QuicClock* clock)
     : clock_(clock),
       num_connections_(kDefaultNumConnections),
       epoch_(QuicTime::Zero()),
-      last_update_time_(QuicTime::Zero()),
-      stats_(stats) {
+      last_update_time_(QuicTime::Zero()) {
   Reset();
 }
 
@@ -79,22 +78,6 @@ void Cubic::Reset() {
   last_target_congestion_window_ = 0;
 }
 
-void Cubic::UpdateCongestionControlStats(QuicPacketCount new_cubic_mode_cwnd,
-                                         QuicPacketCount new_reno_mode_cwnd) {
-  QuicPacketCount highest_new_cwnd = max(new_cubic_mode_cwnd,
-                                         new_reno_mode_cwnd);
-  if (last_congestion_window_ < highest_new_cwnd) {
-    // cwnd will increase to highest_new_cwnd.
-    stats_->cwnd_increase_congestion_avoidance +=
-        highest_new_cwnd - last_congestion_window_;
-    if (new_cubic_mode_cwnd > new_reno_mode_cwnd) {
-      // This cwnd increase is due to cubic mode.
-      stats_->cwnd_increase_cubic_mode +=
-          new_cubic_mode_cwnd - last_congestion_window_;
-    }
-  }
-}
-
 QuicPacketCount Cubic::CongestionWindowAfterPacketLoss(
     QuicPacketCount current_congestion_window) {
   if (current_congestion_window < last_max_congestion_window_) {
@@ -171,10 +154,6 @@ QuicPacketCount Cubic::CongestionWindowAfterAck(
     estimated_tcp_congestion_window_++;
   }
 
-  // Update cubic mode and reno mode stats in QuicConnectionStats.
-  UpdateCongestionControlStats(target_congestion_window,
-                               estimated_tcp_congestion_window_);
-
   // We have a new cubic congestion window.
   last_target_congestion_window_ = target_congestion_window;