Land Recent QUIC Changes

net/tools/quic/quic_client.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_client.h"
 
 #include <errno.h>
 #include <netinet/in.h>
 #include <string.h>
 #include <sys/epoll.h>
@@ skipping 103 matching lines @@
 
   epoll_server_.RegisterFD(fd_, this, kEpollFlags);
   initialized_ = true;
   return true;
 }
 
 bool QuicClient::Connect() {
   if (!StartConnect()) {
     return false;
   }
-  while (CryptoHandshakeInProgress()) {
+  while (EncryptionBeingEstablished()) {
     WaitForEvents();
   }
   return session_->connection()->connected();
 }
 
 bool QuicClient::StartConnect() {
   DCHECK(!connected() && initialized_);
 
   QuicGuid guid = QuicRandom::GetInstance()->RandUint64();
   session_.reset(new QuicClientSession(
       server_hostname_,
       config_,
       new QuicConnection(guid, server_address_,
                          new QuicEpollConnectionHelper(fd_, &epoll_server_),
                          false),
       &crypto_config_));
   return session_->CryptoConnect();
 }
 
-bool QuicClient::CryptoHandshakeInProgress() {
-  return !session_->IsCryptoHandshakeComplete() &&
+bool QuicClient::EncryptionBeingEstablished() {
+  return !session_->IsEncryptionEstablished() &&
       session_->connection()->connected();
 }
 
 void QuicClient::Disconnect() {
   DCHECK(connected());
 
   session()->connection()->SendConnectionClose(QUIC_PEER_GOING_AWAY);
   epoll_server_.UnregisterFD(fd_);
   close(fd_);
   fd_ = -1;
@@ skipping 88 matching lines @@
   }
 
   IPEndPoint client_address(client_ip, client_address_.port());
   session_->connection()->ProcessUdpPacket(
       client_address, server_address, packet);
   return true;
 }
 
 }  // namespace tools
 }  // namespace net