Land Recent QUIC Changes.

net/quic/test_tools/quic_test_packet_maker.h

 // Copyright 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.
 //
 // Provides a simple interface for QUIC tests to create a variety of packets.
 
 #ifndef NET_QUIC_TEST_TOOLS_QUIC_TEST_PACKET_MAKER_H_
 #define NET_QUIC_TEST_TOOLS_QUIC_TEST_PACKET_MAKER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "net/base/request_priority.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_spdy_compressor.h"
 #include "net/quic/test_tools/mock_random.h"
 #include "net/spdy/spdy_framer.h"
 #include "net/spdy/spdy_protocol.h"
 
 namespace net {
 namespace test {
 
 class QuicTestPacketMaker {
  public:
-  QuicTestPacketMaker(QuicVersion version, QuicGuid guid);
+  QuicTestPacketMaker(QuicVersion version, QuicConnectionId connection_id);
   ~QuicTestPacketMaker();
 
   scoped_ptr<QuicEncryptedPacket> MakeRstPacket(
       QuicPacketSequenceNumber num,
       bool include_version,
       QuicStreamId stream_id,
       QuicRstStreamErrorCode error_code);
   scoped_ptr<QuicEncryptedPacket> MakeAckAndRstPacket(
       QuicPacketSequenceNumber num,
       bool include_version,
@@ skipping 43 matching lines @@
   scoped_ptr<QuicEncryptedPacket> MakePacket(
       const QuicPacketHeader& header,
       const QuicFrame& frame);
 
   void InitializeHeader(QuicPacketSequenceNumber sequence_number,
                         bool should_include_version);
 
   std::string SerializeHeaderBlock(const SpdyHeaderBlock& headers);
 
   QuicVersion version_;
-  QuicGuid guid_;
+  QuicConnectionId connection_id_;
   SpdyFramer spdy_request_framer_;
   SpdyFramer spdy_response_framer_;
   MockRandom random_generator_;
   QuicPacketHeader header_;
   QuicSpdyCompressor compressor_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicTestPacketMaker);
 };
 
 }  // namespace test
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_QUIC_TEST_PACKET_MAKER_H_