Land Recent QUIC Changes

net/quic/quic_crypto_server_stream.h

Index: net/quic/quic_crypto_server_stream.h
diff --git a/net/quic/quic_crypto_server_stream.h b/net/quic/quic_crypto_server_stream.h
index 5f9ddd1c7137c9b736064506cc3ecf573f509d1c..ac63495a5584ef987adb07b876f7bb5e3d67d82c 100644
--- a/net/quic/quic_crypto_server_stream.h
+++ b/net/quic/quic_crypto_server_stream.h
@@ -15,6 +15,10 @@ namespace net {
 class QuicSession;
 struct CryptoHandshakeMessage;
 
+namespace test {
+class CryptoTestUtils;
+}  // namespace test
+
 class NET_EXPORT_PRIVATE QuicCryptoServerStream : public QuicCryptoStream {
  public:
   explicit QuicCryptoServerStream(QuicSession* session);
@@ -25,6 +29,8 @@ class NET_EXPORT_PRIVATE QuicCryptoServerStream : public QuicCryptoStream {
       const CryptoHandshakeMessage& message) OVERRIDE;
 
  private:
+  friend class test::CryptoTestUtils;
+
   // config_ contains non-crypto parameters that are negotiated in the crypto
   // handshake.
   QuicConfig config_;