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 cbdd1bbef1ad912cc7fc8632c06caaa7df2bb699..8a4252400de0ff79b25cb73b75df8f6ce7086c32 100644
--- a/net/quic/congestion_control/hybrid_slow_start.cc
+++ b/net/quic/congestion_control/hybrid_slow_start.cc
@@ -33,7 +33,7 @@ void HybridSlowStart::Restart() {
 
 void HybridSlowStart::Reset(QuicPacketSequenceNumber end_sequence_number) {
   DLOG(INFO) << "Reset hybrid slow start @" << end_sequence_number;
-  round_start_ = last_time_ = clock_->Now();
+  round_start_ = last_time_ = clock_->ApproximateNow();
   end_sequence_number_ = end_sequence_number;
   current_rtt_ = QuicTime::Delta::Zero();
   sample_count_ = 0;
@@ -52,7 +52,7 @@ void HybridSlowStart::Update(QuicTime::Delta rtt, QuicTime::Delta delay_min) {
   if (found_ack_train_ || found_delay_) {
     return;
   }
-  QuicTime current_time = clock_->Now();
+  QuicTime current_time = clock_->ApproximateNow();
 
   // First detection parameter - ack-train detection.
   // Since slow start burst out packets we can indirectly estimate the inter-