Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / net / quic / test_tools / quic_connection_peer.cc

diff --git a/src/net/quic/test_tools/quic_connection_peer.cc b/src/net/quic/test_tools/quic_connection_peer.cc
index 83b3884..a8e1db5 100644 (file)
--- a/src/net/quic/test_tools/quic_connection_peer.cc
+++ b/src/net/quic/test_tools/quic_connection_peer.cc
@@ -141,7 +141,7 @@ void QuicConnectionPeer::SetPeerAddress(QuicConnection* connection,
 // static
 void QuicConnectionPeer::SwapCrypters(QuicConnection* connection,
                                       QuicFramer* framer) {
-  framer->SwapCryptersForTest(&connection->framer_);
+  QuicFramerPeer::SwapCrypters(framer, &connection->framer_);
 }
 
 // static
@@ -167,6 +167,17 @@ QuicAlarm* QuicConnectionPeer::GetAckAlarm(QuicConnection* connection) {
 }
 
 // static
+QuicAlarm* QuicConnectionPeer::GetPingAlarm(QuicConnection* connection) {
+  return connection->ping_alarm_.get();
+}
+
+// static
+QuicAlarm* QuicConnectionPeer::GetResumeWritesAlarm(
+    QuicConnection* connection) {
+  return connection->resume_writes_alarm_.get();
+}
+
+// static
 QuicAlarm* QuicConnectionPeer::GetRetransmissionAlarm(
     QuicConnection* connection) {
   return connection->retransmission_alarm_.get();
@@ -178,12 +189,6 @@ QuicAlarm* QuicConnectionPeer::GetSendAlarm(QuicConnection* connection) {
 }
 
 // static
-QuicAlarm* QuicConnectionPeer::GetResumeWritesAlarm(
-    QuicConnection* connection) {
-  return connection->resume_writes_alarm_.get();
-}
-
-// static
 QuicAlarm* QuicConnectionPeer::GetTimeoutAlarm(QuicConnection* connection) {
   return connection->timeout_alarm_.get();
 }