Merge internal change: 63891842 - QuicServerId changes

net/tools/quic/quic_client.cc

Index: net/tools/quic/quic_client.cc
diff --git a/net/tools/quic/quic_client.cc b/net/tools/quic/quic_client.cc
index f0cca3b56918c84c36fe594069a7f990462e02ff..fdf7ca2f1e3bb7588767443fb54ca0f30c8bca20 100644
--- a/net/tools/quic/quic_client.cc
+++ b/net/tools/quic/quic_client.cc
@@ -16,7 +16,7 @@
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_data_reader.h"
 #include "net/quic/quic_protocol.h"
-#include "net/quic/quic_session_key.h"
+#include "net/quic/quic_server_id.h"
 #include "net/tools/balsa/balsa_headers.h"
 #include "net/tools/quic/quic_epoll_connection_helper.h"
 #include "net/tools/quic/quic_socket_utils.h"
@@ -32,12 +32,12 @@ namespace tools {
 const int kEpollFlags = EPOLLIN | EPOLLOUT | EPOLLET;
 
 QuicClient::QuicClient(IPEndPoint server_address,
-                       const QuicSessionKey& server_key,
+                       const QuicServerId& server_id,
                        const QuicVersionVector& supported_versions,
                        bool print_response,
                        uint32 initial_flow_control_window)
     : server_address_(server_address),
-      server_key_(server_key),
+      server_id_(server_id),
       local_port_(0),
       fd_(-1),
       helper_(CreateQuicConnectionHelper()),
@@ -51,12 +51,12 @@ QuicClient::QuicClient(IPEndPoint server_address,
 }
 
 QuicClient::QuicClient(IPEndPoint server_address,
-                       const QuicSessionKey& server_key,
+                       const QuicServerId& server_id,
                        const QuicConfig& config,
                        const QuicVersionVector& supported_versions,
                        uint32 initial_flow_control_window)
     : server_address_(server_address),
-      server_key_(server_key),
+      server_id_(server_id),
       config_(config),
       local_port_(0),
       fd_(-1),
@@ -167,7 +167,7 @@ bool QuicClient::StartConnect() {
   }
 
   session_.reset(new QuicClientSession(
-      server_key_,
+      server_id_,
       config_,
       new QuicConnection(GenerateConnectionId(), server_address_, helper_.get(),
                          writer_.get(), false, supported_versions_,