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

net/quic/quic_spdy_session.h

Index: net/quic/quic_spdy_session.h
diff --git a/net/quic/quic_spdy_session.h b/net/quic/quic_spdy_session.h
index 6f7b4a01e52b762321ba2b7fa4e049b4b90b8dfd..3b5c187e95444fe449ea1d396969d6dd002ef76f 100644
--- a/net/quic/quic_spdy_session.h
+++ b/net/quic/quic_spdy_session.h
@@ -31,7 +31,7 @@ class NET_EXPORT_PRIVATE QuicSpdySession : public QuicSession {
   // received for this stream.  This method will only be called for server
   // streams.
   virtual void OnStreamHeadersPriority(QuicStreamId stream_id,
-                                       QuicPriority priority);
+                                       SpdyPriority priority);
   // Called by |headers_stream_| when headers have been completely received
   // for a stream.  |fin| will be true if the fin flag was set in the headers
   // frame.
@@ -46,7 +46,7 @@ class NET_EXPORT_PRIVATE QuicSpdySession : public QuicSession {
   size_t WriteHeaders(QuicStreamId id,
                       const SpdyHeaderBlock& headers,
                       bool fin,
-                      QuicPriority priority,
+                      SpdyPriority priority,
                       QuicAckListenerInterface* ack_notifier_delegate);
 
   QuicHeadersStream* headers_stream() { return headers_stream_.get(); }