Land Recent QUIC Changes until 03/22/2015.

net/quic/congestion_control/rtt_stats_test.cc

Index: net/quic/congestion_control/rtt_stats_test.cc
diff --git a/net/quic/congestion_control/rtt_stats_test.cc b/net/quic/congestion_control/rtt_stats_test.cc
index 7fc07a3536aa6cd83076345176f5ce903a1418ce..86c79734d651f5835a7fcba5f92d2dacbb4b21f7 100644
--- a/net/quic/congestion_control/rtt_stats_test.cc
+++ b/net/quic/congestion_control/rtt_stats_test.cc
@@ -8,6 +8,7 @@
 
 #include "base/logging.h"
 #include "base/test/mock_log.h"
+#include "net/quic/test_tools/rtt_stats_peer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using logging::LOG_WARNING;
@@ -19,17 +20,6 @@ using testing::_;
 namespace net {
 namespace test {
 
-class RttStatsPeer {
- public:
-  static QuicTime::Delta GetHalfWindowRtt(const RttStats* rtt_stats) {
-    return rtt_stats->half_window_rtt_.rtt;
-  }
-
-  static QuicTime::Delta GetQuarterWindowRtt(const RttStats* rtt_stats) {
-    return rtt_stats->quarter_window_rtt_.rtt;
-  }
-};
-
 class RttStatsTest : public ::testing::Test {
  protected:
   RttStats rtt_stats_;