Update from chromium https://crrev.com/302282

net/quic/congestion_control/cubic.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/congestion_control/cubic.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 60 matching lines @@
   last_update_time_ = QuicTime::Zero();  // Reset time.
   last_congestion_window_ = 0;
   last_max_congestion_window_ = 0;
   acked_packets_count_ = 0;
   estimated_tcp_congestion_window_ = 0;
   origin_point_congestion_window_ = 0;
   time_to_origin_point_ = 0;
   last_target_congestion_window_ = 0;
 }
 
-void Cubic::UpdateCongestionControlStats(
-    QuicTcpCongestionWindow new_cubic_mode_cwnd,
-    QuicTcpCongestionWindow new_reno_mode_cwnd) {
+void Cubic::UpdateCongestionControlStats(QuicPacketCount new_cubic_mode_cwnd,
+                                         QuicPacketCount new_reno_mode_cwnd) {
 
-  QuicTcpCongestionWindow highest_new_cwnd = max(new_cubic_mode_cwnd,
-                                                 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_;
     }
   }
 }
 
-QuicTcpCongestionWindow Cubic::CongestionWindowAfterPacketLoss(
-    QuicTcpCongestionWindow current_congestion_window) {
+QuicPacketCount Cubic::CongestionWindowAfterPacketLoss(
+    QuicPacketCount current_congestion_window) {
   if (current_congestion_window < last_max_congestion_window_) {
     // We never reached the old max, so assume we are competing with another
     // flow. Use our extra back off factor to allow the other flow to go up.
     last_max_congestion_window_ =
         static_cast<int>(kBetaLastMax * current_congestion_window);
   } else {
     last_max_congestion_window_ = current_congestion_window;
   }
   epoch_ = QuicTime::Zero();  // Reset time.
   return static_cast<int>(current_congestion_window * Beta());
 }
 
-QuicTcpCongestionWindow Cubic::CongestionWindowAfterAck(
-    QuicTcpCongestionWindow current_congestion_window,
+QuicPacketCount Cubic::CongestionWindowAfterAck(
+    QuicPacketCount current_congestion_window,
     QuicTime::Delta delay_min) {
   acked_packets_count_ += 1;  // Packets acked.
   QuicTime current_time = clock_->ApproximateNow();
 
   // Cubic is "independent" of RTT, the update is limited by the time elapsed.
   if (last_congestion_window_ == current_congestion_window &&
       (current_time.Subtract(last_update_time_) <= MaxCubicTimeInterval())) {
     return max(last_target_congestion_window_,
                estimated_tcp_congestion_window_);
   }
@@ skipping 18 matching lines @@
     }
   }
   // Change the time unit from microseconds to 2^10 fractions per second. Take
   // the round trip time in account. This is done to allow us to use shift as a
   // divide operator.
   int64 elapsed_time =
       (current_time.Add(delay_min).Subtract(epoch_).ToMicroseconds() << 10) /
       base::Time::kMicrosecondsPerSecond;
 
   int64 offset = time_to_origin_point_ - elapsed_time;
-  QuicTcpCongestionWindow delta_congestion_window = (kCubeCongestionWindowScale
+  QuicPacketCount delta_congestion_window = (kCubeCongestionWindowScale
       * offset * offset * offset) >> kCubeScale;
 
-  QuicTcpCongestionWindow target_congestion_window =
+  QuicPacketCount target_congestion_window =
       origin_point_congestion_window_ - delta_congestion_window;
 
   DCHECK_LT(0u, estimated_tcp_congestion_window_);
   // With dynamic beta/alpha based on number of active streams, it is possible
   // for the required_ack_count to become much lower than acked_packets_count_
   // suddenly, leading to more than one iteration through the following loop.
   while (true) {
     // Update estimated TCP congestion_window.
     uint32 required_ack_count =
         estimated_tcp_congestion_window_ / Alpha();
@@ skipping 15 matching lines @@
   // congestion_window, use highest (fastest).
   if (target_congestion_window < estimated_tcp_congestion_window_) {
     target_congestion_window = estimated_tcp_congestion_window_;
   }
 
   DVLOG(1) << "Target congestion_window: " << target_congestion_window;
   return target_congestion_window;
 }
 
 }  // namespace net