Land Recent QUIC Changes

net/quic/test_tools/mock_crypto_client_stream_factory.h

Index: net/quic/test_tools/mock_crypto_client_stream_factory.h
diff --git a/net/quic/test_tools/mock_crypto_client_stream_factory.h b/net/quic/test_tools/mock_crypto_client_stream_factory.h
index 445e7667cc6f8225e1f9698ced14c80319910637..01d0c75bbbc091eea85145b66ea4e9a943fa5624 100644
--- a/net/quic/test_tools/mock_crypto_client_stream_factory.h
+++ b/net/quic/test_tools/mock_crypto_client_stream_factory.h
@@ -10,11 +10,14 @@
 #include "net/quic/quic_crypto_client_stream.h"
 #include "net/quic/quic_crypto_client_stream_factory.h"
 #include "net/quic/quic_session.h"
+#include "net/quic/test_tools/mock_crypto_client_stream.h"
 
 namespace net {
 
 class MockCryptoClientStreamFactory : public QuicCryptoClientStreamFactory  {
  public:
+  MockCryptoClientStreamFactory();
+
   virtual ~MockCryptoClientStreamFactory() {}
 
   virtual QuicCryptoClientStream* CreateQuicCryptoClientStream(
@@ -22,6 +25,14 @@ class MockCryptoClientStreamFactory : public QuicCryptoClientStreamFactory  {
       const QuicConfig& config,
       QuicSession* session,
       QuicCryptoClientConfig* crypto_config) OVERRIDE;
+
+  void set_handshake_mode(
+      MockCryptoClientStream::HandshakeMode handshake_mode) {
+    handshake_mode_ = handshake_mode;
+  }
+
+ private:
+  MockCryptoClientStream::HandshakeMode handshake_mode_;
 };
 
 }  // namespace net