Land Recent QUIC changes.

net/quic/quic_reliable_client_stream.cc

 // Copyright (c) 2012 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_reliable_client_stream.h"
 
 #include "base/callback_helpers.h"
 #include "net/base/net_errors.h"
 #include "net/quic/quic_session.h"
+#include "net/spdy/write_blocked_list.h"
 
 namespace net {
 
 QuicReliableClientStream::QuicReliableClientStream(QuicStreamId id,
                                                    QuicSession* session,
                                                    const BoundNetLog& net_log)
     : ReliableQuicStream(id, session),
       net_log_(net_log),
       delegate_(NULL) {
 }
@@ skipping 27 matching lines @@
 }
 
 void QuicReliableClientStream::OnCanWrite() {
   ReliableQuicStream::OnCanWrite();
 
   if (!HasBufferedData() && !callback_.is_null()) {
     base::ResetAndReturn(&callback_).Run(OK);
   }
 }
 
+QuicPriority QuicReliableClientStream::EffectivePriority() const {
+  if (delegate_->HasSendHeadersComplete()) {
+    return ReliableQuicStream::EffectivePriority();
+  }
+  return kHighestPriority;
+}
+
 int QuicReliableClientStream::WriteStreamData(
     base::StringPiece data,
     bool fin,
     const CompletionCallback& callback) {
   // We should not have data buffered.
   DCHECK(!HasBufferedData());
   // Writes the data, or buffers it.
   WriteData(data, fin);
   if (!HasBufferedData()) {
     return OK;
@@ skipping 11 matching lines @@
 
 void QuicReliableClientStream::OnError(int error) {
   if (delegate_) {
     QuicReliableClientStream::Delegate* delegate = delegate_;
     delegate_ = NULL;
     delegate->OnError(error);
   }
 }
 
 }  // namespace net