Merge internal change: 63891842 - QuicServerId 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/basictypes.h"
 #include "base/command_line.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_spdy_client_stream.h"
 
 namespace net {
 
 class ProofVerifier;
-class QuicSessionKey;
+class QuicServerId;
 
 namespace tools {
 
 class QuicEpollConnectionHelper;
 
 namespace test {
 class QuicClientPeer;
 }  // namespace test
 
 class QuicClient : public EpollCallbackInterface,
                    public QuicDataStream::Visitor {
  public:
   class ResponseListener {
    public:
     ResponseListener() {}
     virtual ~ResponseListener() {}
     virtual void OnCompleteResponse(QuicStreamId id,
                                     const BalsaHeaders& response_headers,
                                     const string& response_body) = 0;
   };
 
   QuicClient(IPEndPoint server_address,
-             const QuicSessionKey& server_key,
+             const QuicServerId& server_id,
              const QuicVersionVector& supported_versions,
              bool print_response,
              uint32 initial_flow_control_window);
   QuicClient(IPEndPoint server_address,
-             const QuicSessionKey& server_key,
+             const QuicServerId& server_id,
              const QuicConfig& config,
              const QuicVersionVector& supported_versions,
              uint32 initial_flow_control_window);
 
   virtual ~QuicClient();
 
   // Initializes the client to create a connection. Should be called exactly
   // once before calling StartConnect or Connect. Returns true if the
   // initialization succeeds, false otherwise.
   bool Initialize();
@@ skipping 64 matching lines @@
   void set_local_port(int local_port) { local_port_ = local_port; }
 
   const IPEndPoint& server_address() const { return server_address_; }
 
   const IPEndPoint& client_address() const { return client_address_; }
 
   EpollServer* epoll_server() { return &epoll_server_; }
 
   int fd() { return fd_; }
 
-  const QuicSessionKey& server_key() const { return server_key_; }
+  const QuicServerId& server_id() const { return server_id_; }
 
   // This should only be set before the initial Connect()
-  void set_server_key(const QuicSessionKey& server_key) {
-    server_key_ = server_key;
+  void set_server_id(const QuicServerId& server_id) {
+    server_id_ = server_id;
   }
 
   // SetProofVerifier sets the ProofVerifier that will be used to verify the
   // server's certificate and takes ownership of |verifier|.
   void SetProofVerifier(ProofVerifier* verifier) {
     // TODO(rtenneti): We should set ProofVerifier in QuicClientSession.
     crypto_config_.SetProofVerifier(verifier);
   }
 
   // SetChannelIDSigner sets a ChannelIDSigner that will be called when the
@@ skipping 20 matching lines @@
 
  private:
   friend class net::tools::test::QuicClientPeer;
 
   // Read a UDP packet and hand it to the framer.
   bool ReadAndProcessPacket();
 
   // Address of the server.
   const IPEndPoint server_address_;
 
-  // |server_key_| is a tuple (hostname, port, is_https) of the server.
-  QuicSessionKey server_key_;
+  // |server_id_| is a tuple (hostname, port, is_https) of the server.
+  QuicServerId server_id_;
 
   // config_ and crypto_config_ contain configuration and cached state about
   // servers.
   QuicConfig config_;
   QuicCryptoClientConfig crypto_config_;
 
   // Address of the client if the client is connected to the server.
   IPEndPoint client_address_;
 
   // If initialized, the address to bind to.
@@ skipping 43 matching lines @@
   // Size of initial flow control receive window to advertise to server.
   uint32 initial_flow_control_window_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicClient);
 };
 
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_CLIENT_H_