Land Recent QUIC changes

net/quic/test_tools/quic_connection_peer.h

Index: net/quic/test_tools/quic_connection_peer.h
diff --git a/net/quic/test_tools/quic_connection_peer.h b/net/quic/test_tools/quic_connection_peer.h
index 97f7afa9975810460ecc5eb3111564aff9ae3c08..89c6482e1894087671e6c776d4cac31542fcedea 100644
--- a/net/quic/test_tools/quic_connection_peer.h
+++ b/net/quic/test_tools/quic_connection_peer.h
@@ -14,6 +14,7 @@ namespace net {
 struct QuicAckFrame;
 class QuicConnection;
 class QuicConnectionVisitorInterface;
+class QuicFramer;
 class QuicPacketCreator;
 class ReceiveAlgorithmInterface;
 class SendAlgorithmInterface;
@@ -67,6 +68,8 @@ class QuicConnectionPeer {
 
   static void SetIsServer(QuicConnection* connection, bool is_server);
 
+  static void SwapCrypters(QuicConnection* connection, QuicFramer* framer);
+
  private:
   DISALLOW_COPY_AND_ASSIGN(QuicConnectionPeer);
 };