Land Recent QUIC Changes.

net/quic/quic_packet_creator.h

 // 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.
 //
 // Accumulates frames for the next packet until more frames no longer fit or
 // it's time to create a packet from them.  Also provides packet creation of
 // FEC packets based on previously created packets.
 
 #ifndef NET_QUIC_QUIC_PACKET_CREATOR_H_
 #define NET_QUIC_QUIC_PACKET_CREATOR_H_
@@ skipping 207 matching lines @@
     DCHECK(fec_group_.get() == NULL && queued_frames_.empty());
     max_packet_length_ = length;
   }
 
   // Returns current max number of packets covered by an FEC group.
   size_t max_packets_per_fec_group() const {
       return max_packets_per_fec_group_;
   }
 
   // Sets creator's max number of packets covered by an FEC group.
-  void set_max_packets_per_fec_group(
-      size_t max_packets_per_fec_group) {
+  void set_max_packets_per_fec_group(size_t max_packets_per_fec_group) {
     // To turn off FEC protection, use StopFecProtectingPackets().
     DCHECK_NE(0u, max_packets_per_fec_group);
     max_packets_per_fec_group_ = max_packets_per_fec_group;
   }
 
  private:
   friend class test::QuicPacketCreatorPeer;
 
   static bool ShouldRetransmit(const QuicFrame& frame);
 
@@ skipping 50 matching lines @@
   mutable size_t packet_size_;
   QuicFrames queued_frames_;
   scoped_ptr<RetransmittableFrames> queued_retransmittable_frames_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicPacketCreator);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_PACKET_CREATOR_H_