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

net/quic/quartc/quartc_stream.h

Index: net/quic/quartc/quartc_stream.h
diff --git a/net/quic/quartc/quartc_stream.h b/net/quic/quartc/quartc_stream.h
index 188345104215c6c39d347854aa50eb759e2ab35f..3ee21a44697d0fa12022179b2acc5fda7b9b6e3c 100644
--- a/net/quic/quartc/quartc_stream.h
+++ b/net/quic/quartc/quartc_stream.h
@@ -12,7 +12,8 @@
 namespace net {
 
 // Implements a QuartcStreamInterface using a QuicStream.
-class QuartcStream : public QuicStream, public QuartcStreamInterface {
+class QUIC_EXPORT_PRIVATE QuartcStream : public QuicStream,

[Ryan Hamilton, 2017/06/02 00:19:18]

Please make sure these get merged back, as well.

+                                         public QuartcStreamInterface {
  public:
   QuartcStream(QuicStreamId id, QuicSession* session);
 
@@ -32,6 +33,10 @@ class QuartcStream : public QuicStream, public QuartcStreamInterface {
 
   bool fin_sent() override;
 
+  int stream_error() override;
+
+  int connection_error() override;
+
   void Write(const char* data,
              size_t size,
              const WriteParameters& param) override;