Land Recent QUIC Changes until 03/27/2015

net/quic/test_tools/quic_framer_peer.h

Index: net/quic/test_tools/quic_framer_peer.h
diff --git a/net/quic/test_tools/quic_framer_peer.h b/net/quic/test_tools/quic_framer_peer.h
index c6ddb28929d9c5e7879f62f40216add058bf8f98..57818701cf96d7d5e6914de863ce7f59d4b0c7c4 100644
--- a/net/quic/test_tools/quic_framer_peer.h
+++ b/net/quic/test_tools/quic_framer_peer.h
@@ -5,6 +5,7 @@
 #ifndef NET_QUIC_TEST_TOOLS_QUIC_FRAMER_PEER_H_
 #define NET_QUIC_TEST_TOOLS_QUIC_FRAMER_PEER_H_
 
+#include "net/quic/crypto/quic_encrypter.h"
 #include "net/quic/quic_protocol.h"
 
 namespace net {
@@ -30,6 +31,8 @@ class QuicFramerPeer {
   // |framer2|.
   static void SwapCrypters(QuicFramer* framer1, QuicFramer* framer2);
 
+  static QuicEncrypter* GetEncrypter(QuicFramer* framer, EncryptionLevel level);
+
  private:
   DISALLOW_COPY_AND_ASSIGN(QuicFramerPeer);
 };