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

net/quic/p2p/quic_p2p_stream.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_QUIC_P2P_QUIC_P2P_STREAM_H_
 #define NET_QUIC_P2P_QUIC_P2P_STREAM_H_
 
 #include "net/base/completion_callback.h"
 #include "net/base/net_export.h"
 #include "net/quic/reliable_quic_stream.h"
@@ skipping 22 matching lines @@
   };
 
   QuicP2PStream(QuicStreamId id, QuicSession* session);
 
   ~QuicP2PStream() override;
 
   // ReliableQuicStream overrides.
   void OnDataAvailable() override;
   void OnClose() override;
   void OnCanWrite() override;
-  QuicPriority EffectivePriority() const override;
+  SpdyPriority Priority() const override;
 
   void WriteHeader(base::StringPiece data);
 
   int Write(base::StringPiece data, const CompletionCallback& callback);
 
   void SetDelegate(Delegate* delegate);
   Delegate* GetDelegate() { return delegate_; }
 
  private:
   Delegate* delegate_ = nullptr;
 
-  QuicPriority priority_ = 0;
+  SpdyPriority priority_ = 0;
 
   CompletionCallback write_callback_;
   int last_write_size_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(QuicP2PStream);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_P2P_QUIC_P2P_STREAM_H_