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"
 
 namespace net {
 
 struct QuicAckFrame;
 class QuicConnection;
 class QuicConnectionVisitorInterface;
+class QuicFramer;
 class QuicPacketCreator;
 class ReceiveAlgorithmInterface;
 class SendAlgorithmInterface;
 
 namespace test {
 
 // Peer to make public a number of otherwise private QuicConnection methods.
 class QuicConnectionPeer {
  public:
   static void SendAck(QuicConnection* connection);
@@ skipping 33 matching lines @@
                              QuicPacketEntropyHash entropy_hash);
 
   static QuicPacketEntropyHash ReceivedEntropyHash(
       QuicConnection* connection,
       QuicPacketSequenceNumber sequence_number);
 
   static bool IsServer(QuicConnection* connection);
 
   static void SetIsServer(QuicConnection* connection, bool is_server);
 
+  static void SwapCrypters(QuicConnection* connection, QuicFramer* framer);
+
  private:
   DISALLOW_COPY_AND_ASSIGN(QuicConnectionPeer);
 };
 
 }  // namespace test
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_QUIC_TEST_PEER_H_