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 181 matching lines @@
 }
 
 void QuicClient::WaitForStreamToClose(QuicStreamId id) {
   DCHECK(connected());
 
   while (!session_->IsClosedStream(id)) {
     epoll_server_.WaitForEventsAndExecuteCallbacks();
   }
 }
 
+void QuicClient::WaitForCryptoHandshakeConfirmed() {
+  DCHECK(connected());
+
+  while (!session_->IsCryptoHandshakeConfirmed()) {
+    epoll_server_.WaitForEventsAndExecuteCallbacks();
+  }
+}
+
 bool QuicClient::WaitForEvents() {
   DCHECK(connected());
 
   epoll_server_.WaitForEventsAndExecuteCallbacks();
   return session_->num_active_requests() != 0;
 }
 
 void QuicClient::OnEvent(int fd, EpollEvent* event) {
   DCHECK_EQ(fd, fd_);
 
@@ skipping 52 matching lines @@
   }
 
   IPEndPoint client_address(client_ip, client_address_.port());
   session_->connection()->ProcessUdpPacket(
       client_address, server_address, packet);
   return true;
 }
 
 }  // namespace tools
 }  // namespace net