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

net/quic/quic_reliable_client_stream.cc

Index: net/quic/quic_reliable_client_stream.cc
diff --git a/net/quic/quic_reliable_client_stream.cc b/net/quic/quic_reliable_client_stream.cc
index 00132b6ed75b762c449a47ad9deb7e7831e45771..232962d8d2776e3db76e9a19616246ba5701ba1b 100644
--- a/net/quic/quic_reliable_client_stream.cc
+++ b/net/quic/quic_reliable_client_stream.cc
@@ -70,11 +70,11 @@ void QuicReliableClientStream::OnCanWrite() {
   }
 }
 
-QuicPriority QuicReliableClientStream::EffectivePriority() const {
+SpdyPriority QuicReliableClientStream::Priority() const {
   if (delegate_ && delegate_->HasSendHeadersComplete()) {
-    return QuicSpdyStream::EffectivePriority();
+    return QuicSpdyStream::Priority();
   }
-  return QuicWriteBlockedList::kHighestPriority;
+  return net::kHighestPriority;
 }
 
 int QuicReliableClientStream::WriteStreamData(
@@ -126,7 +126,7 @@ int QuicReliableClientStream::Read(IOBuffer* buf, int buf_len) {
 bool QuicReliableClientStream::CanWrite(const CompletionCallback& callback) {
   bool can_write =  session()->connection()->CanWrite(HAS_RETRANSMITTABLE_DATA);
   if (!can_write) {
-    session()->MarkConnectionLevelWriteBlocked(id(), EffectivePriority());
+    session()->MarkConnectionLevelWriteBlocked(id(), Priority());
     DCHECK(callback_.is_null());
     callback_ = callback;
   }