Land Recent QUIC Changes.

net/tools/quic/quic_server_session.cc

 // 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.
 
 #include "net/tools/quic/quic_server_session.h"
 
 #include "base/logging.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/reliable_quic_stream.h"
 #include "net/tools/quic/quic_spdy_server_stream.h"
@@ skipping 26 matching lines @@
 
 void QuicServerSession::OnConnectionClosed(QuicErrorCode error,
                                            bool from_peer) {
   QuicSession::OnConnectionClosed(error, from_peer);
   // In the unlikely event we get a connection close while doing an asynchronous
   // crypto event, make sure we cancel the callback.
   if (FLAGS_cancel_crypto_callbacks_on_close &&
       crypto_stream_.get() != NULL) {
     crypto_stream_->CancelOutstandingCallbacks();
   }
-  visitor_->OnConnectionClosed(connection()->guid(), error);
+  visitor_->OnConnectionClosed(connection()->connection_id(), error);
 }
 
 void QuicServerSession::OnWriteBlocked() {
   QuicSession::OnWriteBlocked();
   visitor_->OnWriteBlocked(connection());
 }
 
 bool QuicServerSession::ShouldCreateIncomingDataStream(QuicStreamId id) {
   if (id % 2 == 0) {
     DVLOG(1) << "Invalid incoming even stream_id:" << id;
@@ skipping 22 matching lines @@
   DLOG(ERROR) << "Server push not yet supported";
   return NULL;
 }
 
 QuicCryptoServerStream* QuicServerSession::GetCryptoStream() {
   return crypto_stream_.get();
 }
 
 }  // namespace tools
 }  // namespace net