Land Recent QUIC Changes

net/tools/quic/quic_client.cc

Index: net/tools/quic/quic_client.cc
diff --git a/net/tools/quic/quic_client.cc b/net/tools/quic/quic_client.cc
index ff8502f012d6fb4c23d34ac48a39044fa9d32a6f..5054eb91dd35ae2c08cc58dcf184d2e43a18d902 100644
--- a/net/tools/quic/quic_client.cc
+++ b/net/tools/quic/quic_client.cc
@@ -121,7 +121,7 @@ bool QuicClient::Connect() {
   if (!StartConnect()) {
     return false;
   }
-  while (CryptoHandshakeInProgress()) {
+  while (EncryptionBeingEstablished()) {
     WaitForEvents();
   }
   return session_->connection()->connected();
@@ -141,8 +141,8 @@ bool QuicClient::StartConnect() {
   return session_->CryptoConnect();
 }
 
-bool QuicClient::CryptoHandshakeInProgress() {
-  return !session_->IsCryptoHandshakeComplete() &&
+bool QuicClient::EncryptionBeingEstablished() {
+  return !session_->IsEncryptionEstablished() &&
       session_->connection()->connected();
 }