Land Recent QUIC Changes

net/quic/congestion_control/hybrid_slow_start.cc

Index: net/quic/congestion_control/hybrid_slow_start.cc
diff --git a/net/quic/congestion_control/hybrid_slow_start.cc b/net/quic/congestion_control/hybrid_slow_start.cc
index 8a4252400de0ff79b25cb73b75df8f6ce7086c32..62b28f81e6ea8e5ca926de244819c5af2a5a6c41 100644
--- a/net/quic/congestion_control/hybrid_slow_start.cc
+++ b/net/quic/congestion_control/hybrid_slow_start.cc
@@ -105,4 +105,9 @@ bool HybridSlowStart::Exit() {
   return false;
 }
 
+QuicTime::Delta HybridSlowStart::SmoothedRtt() {
+  // TODO(satyamshekhar): Calculate and return smooth average of rtt over time.
+  return current_rtt_;
+}
+
 }  // namespace net