Landing Recent QUIC changes until and including Mon Nov 16 14:15:48 2015

net/quic/reliable_quic_stream.h

Index: net/quic/reliable_quic_stream.h
diff --git a/net/quic/reliable_quic_stream.h b/net/quic/reliable_quic_stream.h
index ab36df068240fd356ae86fc9d2811f6e5db6e601..096770c4fac0c8bf21d9eeb12f2a99fc3e1adcdd 100644
--- a/net/quic/reliable_quic_stream.h
+++ b/net/quic/reliable_quic_stream.h
@@ -31,6 +31,10 @@
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_stream_sequencer.h"
 #include "net/quic/quic_types.h"
+//#include "std::strings/std::stringpiece.h"
+//#include "util/refcount/reffed_ptr.h"
+// TODO(alyssar) remove this after cleaning Priority logic from this class.
+#include "net/quic/quic_write_blocked_list.h"
 
 namespace net {
 
@@ -91,9 +95,8 @@ class NET_EXPORT_PRIVATE ReliableQuicStream {
   virtual void CloseConnectionWithDetails(QuicErrorCode error,
                                           const std::string& details);
 
-  // Returns the effective priority for the stream.  This value may change
-  // during the life of the stream.
-  virtual QuicPriority EffectivePriority() const = 0;
+  // Returns the priority for the stream.
+  virtual SpdyPriority Priority() const = 0;
 
   QuicStreamId id() const { return id_; }