Landing Recent QUIC changes until 03:18 AM, May 28, UTC

net/quic/quartc/quartc_session.h

Index: net/quic/quartc/quartc_session.h
diff --git a/net/quic/quartc/quartc_session.h b/net/quic/quartc/quartc_session.h
index 98a365003dcb75a400b8277abce11bf2edf57848..de347aa7e031d81b5b2712e96604eac5a06b0484 100644
--- a/net/quic/quartc/quartc_session.h
+++ b/net/quic/quartc/quartc_session.h
@@ -8,6 +8,7 @@
 #include "net/quic/core/quic_crypto_client_stream.h"
 #include "net/quic/core/quic_crypto_server_stream.h"
 #include "net/quic/core/quic_crypto_stream.h"
+#include "net/quic/core/quic_error_codes.h"
 #include "net/quic/core/quic_session.h"
 #include "net/quic/quartc/quartc_clock_interface.h"
 #include "net/quic/quartc/quartc_session_interface.h"
@@ -26,9 +27,10 @@ class QuartcCryptoServerStreamHelper : public QuicCryptoServerStream::Helper {
                             std::string* error_details) const override;
 };
 
-class QuartcSession : public QuicSession,
-                      public QuartcSessionInterface,
-                      public QuicCryptoClientStream::ProofHandler {
+class QUIC_EXPORT_PRIVATE QuartcSession
+    : public QuicSession,
+      public QuartcSessionInterface,
+      public QuicCryptoClientStream::ProofHandler {
  public:
   QuartcSession(std::unique_ptr<QuicConnection> connection,
                 const QuicConfig& config,
@@ -67,6 +69,8 @@ class QuartcSession : public QuicSession,
   QuartcStreamInterface* CreateOutgoingStream(
       const OutgoingStreamParameters& param) override;
 
+  void CancelStream(QuicStreamId stream_id) override;
+
   void SetDelegate(QuartcSessionInterface::Delegate* session_delegate) override;
 
   void OnTransportCanWrite() override;
@@ -94,7 +98,13 @@ class QuartcSession : public QuicSession,
   QuicStream* CreateIncomingDynamicStream(QuicStreamId id) override;
   std::unique_ptr<QuicStream> CreateStream(QuicStreamId id) override;
 
-  QuartcStream* CreateDataStream(QuicStreamId id, SpdyPriority priority);
+  std::unique_ptr<QuartcStream> CreateDataStream(QuicStreamId id,
+                                                 SpdyPriority priority);
+  // Activates a QuartcStream.  The session takes ownership of the stream, but
+  // returns an unowned pointer to the stream for convenience.
+  QuartcStream* ActivateDataStream(std::unique_ptr<QuartcStream> stream);
+
+  void ResetStream(QuicStreamId stream_id, QuicRstStreamErrorCode error);
 
  private:
   // For crypto handshake.