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

net/quic/p2p/quic_p2p_stream.h

Index: net/quic/p2p/quic_p2p_stream.h
diff --git a/net/quic/p2p/quic_p2p_stream.h b/net/quic/p2p/quic_p2p_stream.h
index 5a1abcccdef3a37d6bbc2a5c95c3011583860c39..aea66f3fa74eeb99a9670da1e5ce8a8072915b2a 100644
--- a/net/quic/p2p/quic_p2p_stream.h
+++ b/net/quic/p2p/quic_p2p_stream.h
@@ -40,7 +40,7 @@ class NET_EXPORT QuicP2PStream : public ReliableQuicStream {
   void OnDataAvailable() override;
   void OnClose() override;
   void OnCanWrite() override;
-  QuicPriority EffectivePriority() const override;
+  SpdyPriority Priority() const override;
 
   void WriteHeader(base::StringPiece data);
 
@@ -52,7 +52,7 @@ class NET_EXPORT QuicP2PStream : public ReliableQuicStream {
  private:
   Delegate* delegate_ = nullptr;
 
-  QuicPriority priority_ = 0;
+  SpdyPriority priority_ = 0;
 
   CompletionCallback write_callback_;
   int last_write_size_ = 0;