Land Recent QUIC Changes.

net/tools/quic/quic_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_CLIENT_H_
 #define NET_TOOLS_QUIC_QUIC_CLIENT_H_
 
 #include <string>
 
 #include "base/command_line.h"
-#include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/ip_endpoint.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/tools/epoll_server/epoll_server.h"
 #include "net/tools/quic/quic_client_session.h"
-#include "net/tools/quic/quic_reliable_client_stream.h"
+#include "net/tools/quic/quic_spdy_client_stream.h"
 
 namespace net {
 
 class ProofVerifier;
 
 namespace tools {
 
 class QuicEpollConnectionHelper;
 
 namespace test {
 class QuicClientPeer;
 }  // namespace test
 
 class QuicClient : public EpollCallbackInterface,
-                   public ReliableQuicStream::Visitor {
+                   public QuicDataStream::Visitor {
  public:
   QuicClient(IPEndPoint server_address,
              const string& server_hostname,
              const QuicVersionVector& supported_versions,
              bool print_response);
   QuicClient(IPEndPoint server_address,
              const std::string& server_hostname,
              const QuicConfig& config,
              const QuicVersionVector& supported_versions);
 
@@ skipping 20 matching lines @@
 
   // Disconnects from the QUIC server.
   void Disconnect();
 
   // Sends a request simple GET for each URL in arg, and then waits for
   // each to complete.
   void SendRequestsAndWaitForResponse(const CommandLine::StringVector& args);
 
   // Returns a newly created CreateReliableClientStream, owned by the
   // QuicClient.
-  QuicReliableClientStream* 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();
 
   // From EpollCallbackInterface
   virtual void OnRegistration(
       EpollServer* eps, int fd, int event_mask) OVERRIDE {}
   virtual void OnModification(int fd, int event_mask) OVERRIDE {}
   virtual void OnEvent(int fd, EpollEvent* event) OVERRIDE;
   // |fd_| can be unregistered without the client being disconnected. This
   // happens in b3m QuicProber where we unregister |fd_| to feed in events to
   // the client from the SelectServer.
   virtual void OnUnregistration(int fd, bool replaced) OVERRIDE {}
   virtual void OnShutdown(EpollServer* eps, int fd) OVERRIDE {}
 
-  // ReliableQuicStream::Visitor
-  virtual void OnClose(ReliableQuicStream* stream) OVERRIDE;
+  // QuicDataStream::Visitor
+  virtual void OnClose(QuicDataStream* stream) OVERRIDE;
 
   QuicPacketCreator::Options* options();
 
   QuicClientSession* session() { return session_.get(); }
 
   bool connected() const;
 
   void set_bind_to_address(IPAddressNumber address) {
     bind_to_address_ = address;
   }
@@ skipping 33 matching lines @@
   virtual QuicGuid GenerateGuid();
   virtual QuicEpollConnectionHelper* CreateQuicConnectionHelper();
   virtual QuicPacketWriter* CreateQuicPacketWriter();
 
  private:
   friend class net::tools::test::QuicClientPeer;
 
   // Read a UDP packet and hand it to the framer.
   bool ReadAndProcessPacket();
 
-  // Set of streams created (and owned) by this client
-  base::hash_set<QuicReliableClientStream*> streams_;
-
   // Address of the server.
   const IPEndPoint server_address_;
 
   // Hostname of the server. This may be a DNS name or an IP address literal.
   std::string server_hostname_;
 
   // config_ and crypto_config_ contain configuration and cached state about
   // servers.
   QuicConfig config_;
   QuicCryptoClientConfig crypto_config_;
@@ skipping 42 matching lines @@
   // when the stream is closed (in OnClose).
   bool print_response_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicClient);
 };
 
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_CLIENT_H_