Landing Recent QUIC changes until Sun Sep 4 03:41:00

net/quic/test_tools/mock_quic_dispatcher.h

Index: net/quic/test_tools/mock_quic_dispatcher.h
diff --git a/net/quic/test_tools/mock_quic_dispatcher.h b/net/quic/test_tools/mock_quic_dispatcher.h
index 4084b4de9f46435301abcafdda9541e08a81b993..e4c41a649628c9c9f746bd9f983f0bb5cae5b87f 100644
--- a/net/quic/test_tools/mock_quic_dispatcher.h
+++ b/net/quic/test_tools/mock_quic_dispatcher.h
@@ -23,7 +23,7 @@ class MockQuicDispatcher : public QuicSimpleDispatcher {
       const QuicCryptoServerConfig* crypto_config,
       QuicVersionManager* version_manager,
       std::unique_ptr<QuicConnectionHelperInterface> helper,
-      std::unique_ptr<QuicServerSessionBase::Helper> session_helper,
+      std::unique_ptr<QuicCryptoServerStream::Helper> session_helper,
       std::unique_ptr<QuicAlarmFactory> alarm_factory);
 
   ~MockQuicDispatcher() override;