Landing Recent QUIC changes until 2/12/2016 21:32 UTC

net/quic/quic_connection.cc

Index: net/quic/quic_connection.cc
diff --git a/net/quic/quic_connection.cc b/net/quic/quic_connection.cc
index e796745e06e137cfc662f8945c95a791ec5cac67..c7aa9540bb14b3da2b89c410f86db5d9ab42015b 100644
--- a/net/quic/quic_connection.cc
+++ b/net/quic/quic_connection.cc
@@ -1511,27 +1511,7 @@ void QuicConnection::WritePendingRetransmissions() {
     // does not require the creator to be flushed.
     packet_generator_.FlushAllQueuedFrames();
     char buffer[kMaxPacketSize];
-    SerializedPacket serialized_packet =
-        packet_generator_.ReserializeAllFrames(pending, buffer, kMaxPacketSize);
-    if (FLAGS_quic_retransmit_via_onserializedpacket) {
-      DCHECK(serialized_packet.encrypted_buffer == nullptr);
-      continue;
-    }
-    if (serialized_packet.encrypted_buffer == nullptr) {
-      // We failed to serialize the packet, so close the connection.
-      // CloseConnection does not send close packet, so no infinite loop here.
-      // TODO(ianswett): This is actually an internal error, not an encryption
-      // failure.
-      CloseConnection(QUIC_ENCRYPTION_FAILURE,
-                      ConnectionCloseSource::FROM_SELF);
-      return;
-    }
-
-    DVLOG(1) << ENDPOINT << "Retransmitting " << pending.packet_number << " as "
-             << serialized_packet.packet_number;
-    serialized_packet.original_packet_number = pending.packet_number;
-    serialized_packet.transmission_type = pending.transmission_type;
-    SendOrQueuePacket(&serialized_packet);
+    packet_generator_.ReserializeAllFrames(pending, buffer, kMaxPacketSize);
   }
 }