Landing Recent QUIC changes until 5/14/2016 02:25:25 UTC

net/tools/quic/quic_server_session_base_test.cc

Index: net/tools/quic/quic_server_session_base_test.cc
diff --git a/net/tools/quic/quic_server_session_base_test.cc b/net/tools/quic/quic_server_session_base_test.cc
index 4ee79191af8375d8895c685d8887e8d331d3fcf6..ff9e7ceaa4d1c87bdf61803d13534fd14b119c0e 100644
--- a/net/tools/quic/quic_server_session_base_test.cc
+++ b/net/tools/quic/quic_server_session_base_test.cc
@@ -417,7 +417,7 @@ TEST_P(QuicServerSessionBaseTest, BandwidthEstimates) {
       QuicSentPacketManagerPeer::GetBandwidthRecorder(sent_packet_manager);
   // Seed an rtt measurement equal to the initial default rtt.
   RttStats* rtt_stats =
-      QuicSentPacketManagerPeer::GetRttStats(sent_packet_manager);
+      const_cast<RttStats*>(sent_packet_manager->GetRttStats());
   rtt_stats->UpdateRtt(
       QuicTime::Delta::FromMicroseconds(rtt_stats->initial_rtt_us()),
       QuicTime::Delta::Zero(), QuicTime::Zero());