PACKET_NBYTE_GUID -> PACKET_NBYTE_CONNECTION_ID

net/tools/quic/quic_dispatcher.h

Index: net/tools/quic/quic_dispatcher.h
diff --git a/net/tools/quic/quic_dispatcher.h b/net/tools/quic/quic_dispatcher.h
index f536ea360fb4255e13c74b0582255a6bc4d404cb..504b27d3373c1d2a04168d2f5d17a37cace15aa3 100644
--- a/net/tools/quic/quic_dispatcher.h
+++ b/net/tools/quic/quic_dispatcher.h
@@ -86,12 +86,13 @@ class QuicDispatcher : public QuicServerSessionVisitor {
 
   // QuicServerSessionVisitor interface implementation:
   // Ensure that the closed connection is cleaned up asynchronously.
-  virtual void OnConnectionClosed(QuicGuid guid, QuicErrorCode error) OVERRIDE;
+  virtual void OnConnectionClosed(QuicConnectionId connection_id,
+                                  QuicErrorCode error) OVERRIDE;
 
   // Queues the blocked writer for later resumption.
   virtual void OnWriteBlocked(QuicBlockedWriterInterface* writer) OVERRIDE;
 
-  typedef base::hash_map<QuicGuid, QuicSession*> SessionMap;
+  typedef base::hash_map<QuicConnectionId, QuicSession*> SessionMap;
 
   // Deletes all sessions on the closed session list and clears the list.
   void DeleteSessions();
@@ -110,11 +111,11 @@ class QuicDispatcher : public QuicServerSessionVisitor {
   virtual QuicPacketWriterWrapper* CreateWriterWrapper(
       QuicPacketWriter* writer);
 
-  virtual QuicSession* CreateQuicSession(QuicGuid guid,
+  virtual QuicSession* CreateQuicSession(QuicConnectionId connection_id,
                                          const IPEndPoint& server_address,
                                          const IPEndPoint& client_address);
 
-  QuicConnection* CreateQuicConnection(QuicGuid guid,
+  QuicConnection* CreateQuicConnection(QuicConnectionId connection_id,
                                        const IPEndPoint& server_address,
                                        const IPEndPoint& client_address);
 
@@ -160,7 +161,7 @@ class QuicDispatcher : public QuicServerSessionVisitor {
   void OnUnauthenticatedHeader(const QuicPacketHeader& header);
 
   // Removes the session from the session map and write blocked list, and
-  // adds the GUID to the time-wait list.
+  // adds the ConnectionId to the time-wait list.
   void CleanUpSession(SessionMap::iterator it);
 
   bool HandlePacketForTimeWait(const QuicPacketPublicHeader& header);
@@ -174,7 +175,7 @@ class QuicDispatcher : public QuicServerSessionVisitor {
 
   SessionMap session_map_;
 
-  // Entity that manages guids in time wait state.
+  // Entity that manages connection_ids in time wait state.
   scoped_ptr<QuicTimeWaitListManager> time_wait_list_manager_;
 
   // An alarm which deletes closed sessions.