Merge internal change: 63891842 - QuicServerId changes

net/tools/quic/quic_client_session_test.cc

 // 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.
 
 #include "net/tools/quic/quic_client_session.h"
 
 #include <vector>
 
 #include "net/base/ip_endpoint.h"
 #include "net/quic/crypto/aes_128_gcm_12_encrypter.h"
@@ skipping 17 matching lines @@
 const uint16 kPort = 80;
 
 class ToolsQuicClientSessionTest
     : public ::testing::TestWithParam<QuicVersion> {
  protected:
   ToolsQuicClientSessionTest()
       : connection_(new PacketSavingConnection(false,
                                                SupportedVersions(GetParam()))) {
     crypto_config_.SetDefaults();
     session_.reset(new QuicClientSession(
-        QuicSessionKey(kServerHostname, kPort, false, kPrivacyModeDisabled),
-        DefaultQuicConfig(), connection_, &crypto_config_));
+        QuicServerId(kServerHostname, kPort, false, kPrivacyModeDisabled),
+        DefaultQuicConfig(),
+        connection_,
+        &crypto_config_));
     session_->config()->SetDefaults();
   }
 
   void CompleteCryptoHandshake() {
     ASSERT_TRUE(session_->CryptoConnect());
     CryptoTestUtils::HandshakeWithFakeServer(
         connection_, session_->GetCryptoStream());
   }
 
   PacketSavingConnection* connection_;
@@ skipping 31 matching lines @@
   // After receiving a GoAway, I should no longer be able to create outgoing
   // streams.
   session_->OnGoAway(QuicGoAwayFrame(QUIC_PEER_GOING_AWAY, 1u, "Going away."));
   EXPECT_EQ(NULL, session_->CreateOutgoingDataStream());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace tools
 }  // namespace net