Merge internal change: 63891842 - QuicServerId changes

net/tools/quic/quic_client.h

Index: net/tools/quic/quic_client.h
diff --git a/net/tools/quic/quic_client.h b/net/tools/quic/quic_client.h
index a439d28e84c5d51b7e7dd3923ea7352dd9766469..cbdf0d7c1c07af6852923b6653409018411a4c35 100644
--- a/net/tools/quic/quic_client.h
+++ b/net/tools/quic/quic_client.h
@@ -25,7 +25,7 @@
 namespace net {
 
 class ProofVerifier;
-class QuicSessionKey;
+class QuicServerId;
 
 namespace tools {
 
@@ -48,12 +48,12 @@ class QuicClient : public EpollCallbackInterface,
   };
 
   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);
@@ -138,11 +138,11 @@ class QuicClient : public EpollCallbackInterface,
 
   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
@@ -183,8 +183,8 @@ class QuicClient : public EpollCallbackInterface,
   // 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.