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>
 #include <sys/socket.h>
 #include <unistd.h>
 
 #include "base/logging.h"
 #include "net/quic/crypto/quic_random.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_data_reader.h"
 #include "net/quic/quic_protocol.h"
 #include "net/tools/balsa/balsa_headers.h"
 #include "net/tools/quic/quic_epoll_connection_helper.h"
-#include "net/tools/quic/quic_reliable_client_stream.h"
 #include "net/tools/quic/quic_socket_utils.h"
+#include "net/tools/quic/quic_spdy_client_stream.h"
 
 #ifndef SO_RXQ_OVFL
 #define SO_RXQ_OVFL 40
 #endif
 
 namespace net {
 namespace tools {
 
 const int kEpollFlags = EPOLLIN | EPOLLOUT | EPOLLET;
 
@@ skipping 148 matching lines @@
     session()->connection()->SendConnectionClose(QUIC_PEER_GOING_AWAY);
   }
   epoll_server_.UnregisterFD(fd_);
   close(fd_);
   fd_ = -1;
   initialized_ = false;
 }
 
 void QuicClient::SendRequestsAndWaitForResponse(
     const CommandLine::StringVector& args) {
-  for (size_t i = 0; i < args.size(); i++) {
+  for (size_t i = 0; i < args.size(); ++i) {
     BalsaHeaders headers;
     headers.SetRequestFirstlineFromStringPieces("GET", args[i], "HTTP/1.1");
-    QuicReliableClientStream* stream = CreateReliableClientStream();
+    QuicSpdyClientStream* stream = CreateReliableClientStream();
     stream->SendRequest(headers, "", true);
     stream->set_visitor(this);
   }
 
   while (WaitForEvents()) { }
 }
 
-QuicReliableClientStream* QuicClient::CreateReliableClientStream() {
+QuicSpdyClientStream* QuicClient::CreateReliableClientStream() {
   if (!connected()) {
     return NULL;
   }
 
-  return session_->CreateOutgoingReliableStream();
+  return session_->CreateOutgoingDataStream();
 }
 
 void QuicClient::WaitForStreamToClose(QuicStreamId id) {
   DCHECK(connected());
 
   while (!session_->IsClosedStream(id)) {
     epoll_server_.WaitForEventsAndExecuteCallbacks();
   }
 }
 
@@ skipping 20 matching lines @@
     }
   }
   if (connected() && (event->in_events & EPOLLOUT)) {
     session_->connection()->OnCanWrite();
   }
   if (event->in_events & EPOLLERR) {
     DLOG(INFO) << "Epollerr";
   }
 }
 
-void QuicClient::OnClose(ReliableQuicStream* stream) {
+void QuicClient::OnClose(QuicDataStream* stream) {
   if (!print_response_) {
     return;
   }
 
-  QuicReliableClientStream* client_stream =
-      static_cast<QuicReliableClientStream*>(stream);
+  QuicSpdyClientStream* client_stream =
+      static_cast<QuicSpdyClientStream*>(stream);
   const BalsaHeaders& headers = client_stream->headers();
   printf("%s\n", headers.first_line().as_string().c_str());
   for (BalsaHeaders::const_header_lines_iterator i =
            headers.header_lines_begin();
        i != headers.header_lines_end(); ++i) {
     printf("%s: %s\n", i->first.as_string().c_str(),
            i->second.as_string().c_str());
   }
   printf("%s\n", client_stream->data().c_str());
 }
@@ skipping 53 matching lines @@
   }
 
   IPEndPoint client_address(client_ip, client_address_.port());
   session_->connection()->ProcessUdpPacket(
       client_address, server_address, packet);
   return true;
 }
 
 }  // namespace tools
 }  // namespace net