Land Recent QUIC Changes.

net/quic/test_tools/quic_test_utils.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.
 //
 // Common utilities for Quic tests
 
 #ifndef NET_QUIC_TEST_TOOLS_QUIC_TEST_UTILS_H_
 #define NET_QUIC_TEST_TOOLS_QUIC_TEST_UTILS_H_
 
 #include <string>
@@ skipping 78 matching lines @@
 // Testing convenience method to construct a QuicAckFrame with all packets
 // from least_unacked to largest_observed acked.
 QuicAckFrame MakeAckFrame(QuicPacketSequenceNumber largest_observed,
                           QuicPacketSequenceNumber least_unacked);
 
 // Testing convenience method to construct a QuicAckFrame with |num_nack_ranges|
 // nack ranges of width 1 packet, starting from |least_unacked|.
 QuicAckFrame MakeAckFrameWithNackRanges(size_t num_nack_ranges,
                                         QuicPacketSequenceNumber least_unacked);
 
-// Returns a SerializedPacket whose |packet| member is owned by the caller,
-// and is populated with the fields in |header| and |frames|, or is NULL if
-// the packet could not be created.
+// Returns a SerializedPacket whose |packet| member is owned by the caller, and
+// is populated with the fields in |header| and |frames|, or is NULL if the
+// packet could not be created.
 SerializedPacket BuildUnsizedDataPacket(QuicFramer* framer,
                                         const QuicPacketHeader& header,
                                         const QuicFrames& frames);
 
 template<typename SaveType>
 class ValueRestore {
  public:
   ValueRestore(SaveType* name, SaveType value)
       : name_(name),
         value_(*name) {
@@ skipping 388 matching lines @@
   virtual ~MockAckNotifierDelegate();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAckNotifierDelegate);
 };
 
 }  // namespace test
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_QUIC_TEST_UTILS_H_