Land Recent QUIC changes.

net/quic/test_tools/quic_connection_peer.h

 // 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.
 
 #ifndef NET_QUIC_TEST_TOOLS_QUIC_CONNECTION_PEER_H_
 #define NET_QUIC_TEST_TOOLS_QUIC_CONNECTION_PEER_H_
 
 #include "base/basictypes.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_stats.h"
@@ skipping 28 matching lines @@
 
   static QuicConnectionVisitorInterface* GetVisitor(
       QuicConnection* connection);
 
   static QuicPacketCreator* GetPacketCreator(QuicConnection* connection);
 
   static bool GetReceivedTruncatedAck(QuicConnection* connection);
 
   static size_t GetNumRetransmissionTimeouts(QuicConnection* connection);
 
-  static QuicTime::Delta GetTimeout(QuicConnection* connection);
+  static QuicTime::Delta GetNetworkTimeout(QuicConnection* connection);
 
   static bool IsSavedForRetransmission(
       QuicConnection* connection,
       QuicPacketSequenceNumber sequence_number);
 
   static size_t GetRetransmissionCount(
       QuicConnection* connection,
       QuicPacketSequenceNumber sequence_number);
 
   static QuicPacketEntropyHash GetSentEntropyHash(
@@ skipping 24 matching lines @@
   static QuicFecGroup* GetFecGroup(QuicConnection* connection, int fec_group);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(QuicConnectionPeer);
 };
 
 }  // namespace test
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_QUIC_TEST_PEER_H_