Landing Recent QUIC changes until 9:41 AM, Oct 10, 2016 UTC-7

net/quic/core/congestion_control/rtt_stats.h

Index: net/quic/core/congestion_control/rtt_stats.h
diff --git a/net/quic/core/congestion_control/rtt_stats.h b/net/quic/core/congestion_control/rtt_stats.h
index d88bc643768dd25663b1d2d1153fe03d015509ef..242e3419e9503d5d987800deb30e8380ab036113 100644
--- a/net/quic/core/congestion_control/rtt_stats.h
+++ b/net/quic/core/congestion_control/rtt_stats.h
@@ -13,7 +13,6 @@
 
 #include "base/macros.h"
 #include "net/base/net_export.h"
-#include "net/quic/core/congestion_control/windowed_filter.h"
 #include "net/quic/core/quic_bug_tracker.h"
 #include "net/quic/core/quic_protocol.h"
 #include "net/quic/core/quic_time.h"
@@ -39,10 +38,6 @@ class NET_EXPORT_PRIVATE RttStats {
   // it's larger.
   void ExpireSmoothedMetrics();
 
-  // Forces RttStats to sample a new windowed min rtt within the next
-  // |num_samples| UpdateRtt calls.
-  void SampleNewWindowedMinRtt(uint32_t num_samples);
-
   // Called when connection migrates and rtt measurement needs to be reset.
   void OnConnectionMigration();
 
@@ -74,15 +69,9 @@ class NET_EXPORT_PRIVATE RttStats {
 
   QuicTime::Delta mean_deviation() const { return mean_deviation_; }
 
-  QuicTime::Delta WindowedMinRtt() { return windowed_min_rtt_.GetBest(); }
-
  private:
   friend class test::RttStatsPeer;
 
-  // Updates the windowed min rtt. Also forces a new windowed_min_rtt sample,
-  // if set by a call to SampleNewWindowedMinRtt() above.
-  void UpdateWindowedMinRtt(QuicTime::Delta rtt_sample, QuicTime now);
-
   QuicTime::Delta latest_rtt_;
   QuicTime::Delta min_rtt_;
   QuicTime::Delta smoothed_rtt_;
@@ -93,19 +82,6 @@ class NET_EXPORT_PRIVATE RttStats {
   QuicTime::Delta mean_deviation_;
   int64_t initial_rtt_us_;
 
-  // Variables used to force a new windowed_min_rtt measurement within
-  // num_samples_for_forced_min_.
-  QuicTime::Delta forced_windowed_min_rtt_;
-  QuicTime forced_windowed_min_rtt_time_;
-  uint32_t num_samples_for_forced_min_;
-
-  // Windowed min_rtt.
-  WindowedFilter<QuicTime::Delta,
-                 MinFilter<QuicTime::Delta>,
-                 QuicTime,
-                 QuicTime::Delta>
-      windowed_min_rtt_;
-
   DISALLOW_COPY_AND_ASSIGN(RttStats);
 };