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

net/quic/quic_crypto_stream.cc

Index: net/quic/quic_crypto_stream.cc
diff --git a/net/quic/quic_crypto_stream.cc b/net/quic/quic_crypto_stream.cc
index 077876084a2ffeec242553167d430eaa8450656b..fdee37302af478edb80d84d70390e2b3d7bb2c85 100644
--- a/net/quic/quic_crypto_stream.cc
+++ b/net/quic/quic_crypto_stream.cc
@@ -15,6 +15,7 @@
 
 using std::string;
 using base::StringPiece;
+using net::SpdyPriority;
 
 namespace net {
 
@@ -58,8 +59,8 @@ void QuicCryptoStream::OnDataAvailable() {
   }
 }
 
-QuicPriority QuicCryptoStream::EffectivePriority() const {
-  return QuicUtils::HighestPriority();
+SpdyPriority QuicCryptoStream::Priority() const {
+  return net::kHighestPriority;  // The smallest priority is also the highest
 }
 
 void QuicCryptoStream::SendHandshakeMessage(