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/quic/quic_write_blocked_list.h"
@@ skipping 75 matching lines @@
 
 void QuicReliableClientStream::OnError(int error) {
   if (delegate_) {
     QuicReliableClientStream::Delegate* delegate = delegate_;
     delegate_ = NULL;
     delegate->OnError(error);
   }
 }
 
 bool QuicReliableClientStream::CanWrite(const CompletionCallback& callback) {
-  bool can_write =  session()->connection()->CanWrite(
-      NOT_RETRANSMISSION, HAS_RETRANSMITTABLE_DATA);
+  bool can_write =  session()->connection()->CanWrite(HAS_RETRANSMITTABLE_DATA);
   if (!can_write) {
     session()->MarkWriteBlocked(id(), EffectivePriority());
     DCHECK(callback_.is_null());
     callback_ = callback;
   }
   return can_write;
 }
 
 }  // namespace net