Land Recent QUIC Changes

net/quic/quic_crypto_client_stream.h

Index: net/quic/quic_crypto_client_stream.h
diff --git a/net/quic/quic_crypto_client_stream.h b/net/quic/quic_crypto_client_stream.h
index 1f76c110b86ebaebf55aeff3cd77e06e6e4433ce..33cf6c463769c45eb09f12e6254fabd33abfce9d 100644
--- a/net/quic/quic_crypto_client_stream.h
+++ b/net/quic/quic_crypto_client_stream.h
@@ -15,6 +15,10 @@ namespace net {
 class QuicSession;
 struct CryptoHandshakeMessage;
 
+namespace test {
+class CryptoTestUtils;
+}  // namespace test
+
 class NET_EXPORT_PRIVATE QuicCryptoClientStream : public QuicCryptoStream {
  public:
   QuicCryptoClientStream(QuicSession* session, const string& server_hostname);
@@ -29,6 +33,8 @@ class NET_EXPORT_PRIVATE QuicCryptoClientStream : public QuicCryptoStream {
   bool CryptoConnect();
 
  private:
+  friend class test::CryptoTestUtils;
+
   QuicConfig config_;
   QuicCryptoClientConfig crypto_config_;