Land Recent QUIC changes.

net/quic/test_tools/quic_connection_peer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/test_tools/quic_connection_peer.h"
 
 #include "base/stl_util.h"
 #include "net/quic/congestion_control/quic_congestion_manager.h"
 #include "net/quic/congestion_control/receive_algorithm_interface.h"
 #include "net/quic/congestion_control/send_algorithm_interface.h"
@@ skipping 45 matching lines @@
     return connection->received_truncated_ack_;
 }
 
 // static
 size_t QuicConnectionPeer::GetNumRetransmissionTimeouts(
     QuicConnection* connection) {
   return connection->retransmission_timeouts_.size();
 }
 
 // static
-QuicTime::Delta QuicConnectionPeer::GetTimeout(QuicConnection* connection) {
-  return connection->timeout_;
+QuicTime::Delta QuicConnectionPeer::GetNetworkTimeout(
+    QuicConnection* connection) {
+  return connection->idle_network_timeout_;
 }
 
 // static
 bool QuicConnectionPeer::IsSavedForRetransmission(
     QuicConnection* connection,
     QuicPacketSequenceNumber sequence_number) {
   return ContainsKey(connection->retransmission_map_, sequence_number);
 }
 
 // static
@@ skipping 62 matching lines @@
 }
 
 QuicFecGroup* QuicConnectionPeer::GetFecGroup(QuicConnection* connection,
                                               int fec_group) {
   connection->last_header_.fec_group = fec_group;
   return connection->GetFecGroup();
 }
 
 }  // namespace test
 }  // namespace net