Land Recent QUIC changes.

net/quic/quic_client_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/quic/quic_client_session.h"
 
 #include "base/callback_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
@@ skipping 296 matching lines @@
 
   UMA_HISTOGRAM_SPARSE_SLOWLY("Net.QuicSession.QuicVersion",
                               connection()->version());
   if (!callback_.is_null()) {
     base::ResetAndReturn(&callback_).Run(ERR_QUIC_PROTOCOL_ERROR);
   }
   QuicSession::ConnectionClose(error, from_peer);
   NotifyFactoryOfSessionCloseLater();
 }
 
+void QuicClientSession::OnSuccessfulVersionNegotiation(
+    const QuicVersion& version) {
+  logger_.OnSuccessfulVersionNegotiation(version);
+  QuicSession::OnSuccessfulVersionNegotiation(version);
+}
+
 void QuicClientSession::StartReading() {
   if (read_pending_) {
     return;
   }
   read_pending_ = true;
   int rv = socket_->Read(read_buffer_.get(),
                          read_buffer_->size(),
                          base::Bind(&QuicClientSession::OnReadComplete,
                                     weak_factory_.GetWeakPtr()));
   if (rv == ERR_IO_PENDING) {
@@ skipping 89 matching lines @@
 }
 
 void QuicClientSession::NotifyFactoryOfSessionClose() {
   DCHECK_EQ(0u, GetNumOpenStreams());
   DCHECK(stream_factory_);
   // Will delete |this|.
   stream_factory_->OnSessionClose(this);
 }
 
 }  // namespace net