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

net/quic/quic_spdy_session.cc

 // Copyright (c) 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.
 
 #include "net/quic/quic_spdy_session.h"
 
 #include "net/quic/quic_headers_stream.h"
 
 namespace net {
 
@@ skipping 24 matching lines @@
                                       StringPiece headers_data) {
   QuicSpdyStream* stream = GetSpdyDataStream(stream_id);
   if (!stream) {
     // It's quite possible to receive headers after a stream has been reset.
     return;
   }
   stream->OnStreamHeaders(headers_data);
 }
 
 void QuicSpdySession::OnStreamHeadersPriority(QuicStreamId stream_id,
-                                              QuicPriority priority) {
+                                              SpdyPriority priority) {
   QuicSpdyStream* stream = GetSpdyDataStream(stream_id);
   if (!stream) {
     // It's quite possible to receive headers after a stream has been reset.
     return;
   }
   stream->OnStreamHeadersPriority(priority);
 }
 
 void QuicSpdySession::OnStreamHeadersComplete(QuicStreamId stream_id,
                                               bool fin,
                                               size_t frame_len) {
   QuicSpdyStream* stream = GetSpdyDataStream(stream_id);
   if (!stream) {
     // It's quite possible to receive headers after a stream has been reset.
     return;
   }
   stream->OnStreamHeadersComplete(fin, frame_len);
 }
 
 size_t QuicSpdySession::WriteHeaders(
     QuicStreamId id,
     const SpdyHeaderBlock& headers,
     bool fin,
-    QuicPriority priority,
+    SpdyPriority priority,
     QuicAckListenerInterface* ack_notifier_delegate) {
   return headers_stream_->WriteHeaders(id, headers, fin, priority,
                                        ack_notifier_delegate);
 }
 
 void QuicSpdySession::OnHeadersHeadOfLineBlocking(QuicTime::Delta delta) {
   // Implemented in Chromium for stats tracking.
 }
 
 QuicSpdyStream* QuicSpdySession::GetSpdyDataStream(
     const QuicStreamId stream_id) {
   return static_cast<QuicSpdyStream*>(GetOrCreateDynamicStream(stream_id));
 }
 
 }  // namespace net