Land Recent QUIC Changes.

net/quic/quic_packet_creator.h

Index: net/quic/quic_packet_creator.h
diff --git a/net/quic/quic_packet_creator.h b/net/quic/quic_packet_creator.h
index 152085e1245973c310cb7a75564b15b42c26045d..5b01319bb29008cb6bfd323f6bf3fa40d7b2d2e7 100644
--- a/net/quic/quic_packet_creator.h
+++ b/net/quic/quic_packet_creator.h
@@ -34,19 +34,19 @@ class NET_EXPORT_PRIVATE QuicPacketCreator : public QuicFecBuilderInterface {
     Options()
         : max_packet_length(kDefaultMaxPacketSize),
           max_packets_per_fec_group(0),
-          send_guid_length(PACKET_8BYTE_GUID),
+          send_connection_id_length(PACKET_8BYTE_CONNECTION_ID),
           send_sequence_number_length(PACKET_1BYTE_SEQUENCE_NUMBER) {}
 
     size_t max_packet_length;
     // 0 indicates fec is disabled.
     size_t max_packets_per_fec_group;
-    // Length of guid to send over the wire.
-    QuicGuidLength send_guid_length;
+    // Length of connection_id to send over the wire.
+    QuicConnectionIdLength send_connection_id_length;
     QuicSequenceNumberLength send_sequence_number_length;
   };
 
   // QuicRandom* required for packet entropy.
-  QuicPacketCreator(QuicGuid guid,
+  QuicPacketCreator(QuicConnectionId connection_id,
                     QuicFramer* framer,
                     QuicRandom* random_generator,
                     bool is_server);
@@ -73,7 +73,7 @@ class NET_EXPORT_PRIVATE QuicPacketCreator : public QuicFecBuilderInterface {
   // The overhead the framing will add for a packet with one frame.
   static size_t StreamFramePacketOverhead(
       QuicVersion version,
-      QuicGuidLength guid_length,
+      QuicConnectionIdLength connection_id_length,
       bool include_version,
       QuicSequenceNumberLength sequence_number_length,
       InFecGroup is_in_fec_group);
@@ -198,7 +198,7 @@ class NET_EXPORT_PRIVATE QuicPacketCreator : public QuicFecBuilderInterface {
   void MaybeAddPadding();
 
   Options options_;
-  QuicGuid guid_;
+  QuicConnectionId connection_id_;
   QuicFramer* framer_;
   scoped_ptr<QuicRandomBoolSource> random_bool_source_;
   QuicPacketSequenceNumber sequence_number_;