Unify the QUIC client classes.

net/tools/quic/quic_simple_client.h

 // 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.
 //
 // A toy client, which connects to a specified port and sends QUIC
 // request to that endpoint.
 
 #ifndef NET_TOOLS_QUIC_QUIC_SIMPLE_CLIENT_H_
 #define NET_TOOLS_QUIC_QUIC_SIMPLE_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_log.h"
 #include "net/http/http_response_headers.h"
 #include "net/quic/crypto/crypto_handshake.h"
 #include "net/quic/quic_config.h"
 #include "net/quic/quic_framer.h"
 #include "net/quic/quic_packet_creator.h"
 #include "net/quic/quic_packet_reader.h"
-#include "net/tools/quic/quic_simple_client_session.h"
-#include "net/tools/quic/quic_simple_client_stream.h"
+#include "net/tools/quic/quic_client_session.h"
+#include "net/tools/quic/quic_spdy_client_stream.h"
 
 namespace net {
 
 struct HttpRequestInfo;
 class ProofVerifier;
 class QuicServerId;
 class QuicConnectionHelper;
 class UDPClientSocket;
 
 namespace tools {
@@ skipping 56 matching lines @@
   // Sends an HTTP request and waits for response before returning.
   void SendRequestAndWaitForResponse(const HttpRequestInfo& headers,
                                      base::StringPiece body,
                                      bool fin);
 
   // Sends a request simple GET for each URL in |args|, and then waits for
   // each to complete.
   void SendRequestsAndWaitForResponse(
       const base::CommandLine::StringVector& url_list);
 
-  // Returns a newly created QuicSimpleClientStream, owned by the
+  // Returns a newly created QuicSpdyClientStream, owned by the
   // QuicSimpleClient.
-  QuicSimpleClientStream* CreateReliableClientStream();
+  QuicSpdyClientStream* CreateReliableClientStream();
 
   // Wait for events until the stream with the given ID is closed.
   void WaitForStreamToClose(QuicStreamId id);
 
   // Wait for events until the handshake is confirmed.
   void WaitForCryptoHandshakeConfirmed();
 
   // Wait up to 50ms, and handle any events which occur.
   // Returns true if there are any outstanding requests.
   bool WaitForEvents();
 
   // QuicPacketReader::Visitor
   void OnReadError(int result) override;
   bool OnPacket(const QuicEncryptedPacket& packet,
                 IPEndPoint local_address,
                 IPEndPoint peer_address) override;
 
   // QuicDataStream::Visitor
   void OnClose(QuicDataStream* stream) override;
 
-  QuicSimpleClientSession* session() { return session_.get(); }
+  QuicClientSession* session() { return session_.get(); }
 
   bool connected() const;
   bool goaway_received() const;
 
   void set_bind_to_address(IPAddressNumber address) {
     bind_to_address_ = address;
   }
 
   IPAddressNumber bind_to_address() const { return bind_to_address_; }
 
@@ skipping 93 matching lines @@
   // If initialized, the address to bind to.
   IPAddressNumber bind_to_address_;
   // Local port to bind to. Initialize to 0.
   int local_port_;
 
   // Writer used to actually send packets to the wire. Needs to outlive
   // |session_|.
   scoped_ptr<QuicPacketWriter> writer_;
 
   // Session which manages streams.
-  scoped_ptr<QuicSimpleClientSession> session_;
+  scoped_ptr<QuicClientSession> session_;
 
   // UDP socket connected to the server.
   scoped_ptr<UDPClientSocket> socket_;
 
   // Connection on the socket. Owned by |session_|.
   QuicConnection* connection_;
 
   // Helper to be used by created connections.
   scoped_ptr<QuicConnectionHelper> helper_;
 
@@ skipping 34 matching lines @@
 
   base::WeakPtrFactory<QuicSimpleClient> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicSimpleClient);
 };
 
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_SIMPLE_CLIENT_H_