Landing Recent QUIC changes until 01/31/2016 05:22 UTC

net/quic/test_tools/quic_packet_creator_peer.cc

 // Copyright (c) 2013 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/test_tools/quic_packet_creator_peer.h"
 
 #include "net/quic/quic_packet_creator.h"
 
 namespace net {
 namespace test {
@@ skipping 108 matching lines @@
     size_t buffer_len) {
   DCHECK(creator->queued_frames_.empty());
   DCHECK(!frames.empty());
   for (const QuicFrame& frame : frames) {
     bool success = creator->AddFrame(frame, false);
     DCHECK(success);
   }
   creator->SerializePacket(buffer, buffer_len);
   SerializedPacket packet = creator->packet_;
   // The caller takes ownership of the QuicEncryptedPacket.
-  creator->packet_.packet = nullptr;
+  creator->packet_.encrypted_buffer = nullptr;
   DCHECK(packet.retransmittable_frames.empty());
   return packet;
 }
 
 // static
 void QuicPacketCreatorPeer::ResetFecGroup(QuicPacketCreator* creator) {
   creator->ResetFecGroup();
 }
 
 // static
@@ skipping 14 matching lines @@
   return creator->packet_.encryption_level;
 }
 
 // static
 QuicPathId QuicPacketCreatorPeer::GetCurrentPath(QuicPacketCreator* creator) {
   return creator->packet_.path_id;
 }
 
 }  // namespace test
 }  // namespace net