Landing Recent QUIC changes until Sun Sep 4 03:41:00

net/quic/core/quic_packet_creator.h

Index: net/quic/core/quic_packet_creator.h
diff --git a/net/quic/core/quic_packet_creator.h b/net/quic/core/quic_packet_creator.h
index a3a1415ab169026926cb651f537e9029b7904798..eb0c0fc47f42fc2cea47dc7cc205ee7a10fb7591 100644
--- a/net/quic/core/quic_packet_creator.h
+++ b/net/quic/core/quic_packet_creator.h
@@ -115,18 +115,16 @@ class NET_EXPORT_PRIVATE QuicPacketCreator {
   // to further process the SerializedPacket.
   void Flush();
 
-  // Optimized method to create a QuicStreamFrame, serialize it, and encrypt it
-  // into |encrypted_buffer|. Adds the QuicStreamFrame to the returned
-  // SerializedPacket.  Sets |num_bytes_consumed| to the number of bytes
-  // consumed to create the QuicStreamFrame.
+  // Optimized method to create a QuicStreamFrame and serialize it. Adds the
+  // QuicStreamFrame to the returned SerializedPacket.  Sets
+  // |num_bytes_consumed| to the number of bytes consumed to create the
+  // QuicStreamFrame.
   void CreateAndSerializeStreamFrame(QuicStreamId id,
                                      const QuicIOVector& iov,
                                      QuicStreamOffset iov_offset,
                                      QuicStreamOffset stream_offset,
                                      bool fin,
                                      QuicAckListenerInterface* listener,
-                                     char* encrypted_buffer,
-                                     size_t encrypted_buffer_len,
                                      size_t* num_bytes_consumed);
 
   // Returns true if there are frames pending to be serialized.