Landing Recent QUIC changes until 3:35 PM, Apr 26, 2017 UTC-4

net/quic/core/quic_packet_generator.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/core/quic_packet_generator.h"
 
 #include <cstdint>
 
 #include "net/quic/core/crypto/quic_random.h"
 #include "net/quic/core/quic_utils.h"
@@ skipping 330 matching lines @@
       random_generator_->RandUint64() % kMaxNumRandomPaddingBytes + 1);
 }
 
 void QuicPacketGenerator::SendRemainingPendingPadding() {
   while (packet_creator_.pending_padding_bytes() > 0 && !HasQueuedFrames() &&
          CanSendWithNextPendingFrameAddition()) {
     packet_creator_.Flush();
   }
 }
 
+bool QuicPacketGenerator::HasRetransmittableFrames() const {
+  return !queued_control_frames_.empty() ||
+         packet_creator_.HasPendingRetransmittableFrames();
+}
+
 }  // namespace net