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 40 matching lines @@
       local_port_(0),
       fd_(-1),
       initialized_(false),
       packets_dropped_(0),
       overflow_supported_(false) {
 }
 
 QuicClient::~QuicClient() {
   if (connected()) {
     session()->connection()->SendConnectionClosePacket(
-        QUIC_PEER_GOING_AWAY, string());
+        QUIC_PEER_GOING_AWAY, "");
   }
 }
 
 bool QuicClient::Initialize() {
   DCHECK(!initialized_);
 
   epoll_server_.set_timeout_in_us(50 * 1000);
   crypto_config_.SetDefaults();
 
   int address_family = server_address_.GetSockAddrFamily();
@@ skipping 104 matching lines @@
   for (int i = 1; i < argc; ++i) {
     BalsaHeaders headers;
     headers.SetRequestFirstlineFromStringPieces("GET", argv[i], "HTTP/1.1");
     CreateReliableClientStream()->SendRequest(headers, "", true);
   }
 
   while (WaitForEvents()) { }
 }
 
 QuicReliableClientStream* QuicClient::CreateReliableClientStream() {
-  DCHECK(connected());
+  if (!connected()) {
+    return NULL;
+  }
 
   return session_->CreateOutgoingReliableStream();
 }
 
 void QuicClient::WaitForStreamToClose(QuicStreamId id) {
   DCHECK(connected());
 
   while (!session_->IsClosedStream(id)) {
     epoll_server_.WaitForEventsAndExecuteCallbacks();
   }
@@ skipping 64 matching lines @@
   }
 
   IPEndPoint client_address(client_ip, client_address_.port());
   session_->connection()->ProcessUdpPacket(
       client_address, server_address, packet);
   return true;
 }
 
 }  // namespace tools
 }  // namespace net