Merge internal change: 63891842 - QuicServerId changes

net/quic/quic_crypto_client_stream_test.cc

Index: net/quic/quic_crypto_client_stream_test.cc
diff --git a/net/quic/quic_crypto_client_stream_test.cc b/net/quic/quic_crypto_client_stream_test.cc
index a45fbfe233fb95a52f8e8ba5b777c32a73b7ee63..293d5c1a7089b24626f3b593ea8329b33545a9f6 100644
--- a/net/quic/quic_crypto_client_stream_test.cc
+++ b/net/quic/quic_crypto_client_stream_test.cc
@@ -10,7 +10,7 @@
 #include "net/quic/crypto/quic_encrypter.h"
 #include "net/quic/quic_flags.h"
 #include "net/quic/quic_protocol.h"
-#include "net/quic/quic_session_key.h"
+#include "net/quic/quic_server_id.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/quic/test_tools/simple_quic_framer.h"
@@ -29,9 +29,9 @@ class QuicCryptoClientStreamTest : public ::testing::Test {
   QuicCryptoClientStreamTest()
       : connection_(new PacketSavingConnection(false)),
         session_(new TestClientSession(connection_, DefaultQuicConfig())),
-        server_key_(kServerHostname, kServerPort, false, kPrivacyModeDisabled),
+        server_id_(kServerHostname, kServerPort, false, kPrivacyModeDisabled),
         stream_(new QuicCryptoClientStream(
-            server_key_, session_.get(), NULL, &crypto_config_)) {
+            server_id_, session_.get(), NULL, &crypto_config_)) {
     session_->SetCryptoStream(stream_.get());
     session_->config()->SetDefaults();
     crypto_config_.SetDefaults();
@@ -49,7 +49,7 @@ class QuicCryptoClientStreamTest : public ::testing::Test {
 
   PacketSavingConnection* connection_;
   scoped_ptr<TestClientSession> session_;
-  QuicSessionKey server_key_;
+  QuicServerId server_id_;
   scoped_ptr<QuicCryptoClientStream> stream_;
   CryptoHandshakeMessage message_;
   scoped_ptr<QuicData> message_data_;
@@ -107,8 +107,8 @@ TEST_F(QuicCryptoClientStreamTest, NegotiatedParameters) {
 }
 
 TEST_F(QuicCryptoClientStreamTest, InvalidHostname) {
-  QuicSessionKey server_key("invalid", 80, false, kPrivacyModeDisabled);
-  stream_.reset(new QuicCryptoClientStream(server_key, session_.get(), NULL,
+  QuicServerId server_id("invalid", 80, false, kPrivacyModeDisabled);
+  stream_.reset(new QuicCryptoClientStream(server_id, session_.get(), NULL,
                                            &crypto_config_));
   session_->SetCryptoStream(stream_.get());
 
@@ -123,7 +123,7 @@ TEST_F(QuicCryptoClientStreamTest, ExpiredServerConfig) {
 
   connection_ = new PacketSavingConnection(true);
   session_.reset(new TestClientSession(connection_, DefaultQuicConfig()));
-  stream_.reset(new QuicCryptoClientStream(server_key_, session_.get(), NULL,
+  stream_.reset(new QuicCryptoClientStream(server_id_, session_.get(), NULL,
                                            &crypto_config_));
 
   session_->SetCryptoStream(stream_.get());