Merge internal change: 63891842 - QuicServerId changes

net/tools/quic/quic_spdy_client_stream_test.cc

 // Copyright 2013 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_spdy_client_stream.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "net/quic/quic_utils.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/tools/epoll_server/epoll_server.h"
@@ skipping 12 matching lines @@
 namespace net {
 namespace tools {
 namespace test {
 namespace {
 
 class QuicSpdyClientStreamTest : public TestWithParam<QuicVersion> {
  public:
   QuicSpdyClientStreamTest()
       : connection_(new StrictMock<MockConnection>(
             false, SupportedVersions(GetParam()))),
-        session_(QuicSessionKey("example.com", 80, false, kPrivacyModeDisabled),
+        session_(QuicServerId("example.com", 80, false, kPrivacyModeDisabled),
                  DefaultQuicConfig(),
-                 connection_, &crypto_config_),
+                 connection_,
+                 &crypto_config_),
         body_("hello world") {
     crypto_config_.SetDefaults();
 
     headers_.SetResponseFirstlineFromStringPieces("HTTP/1.1", "200", "Ok");
     headers_.ReplaceOrAppendHeader("content-length", "11");
 
     headers_string_ = SpdyUtils::SerializeResponseHeaders(headers_);
 
     // New streams rely on having the peer's flow control receive window
     // negotiated in the config.
@@ skipping 53 matching lines @@
 
   EXPECT_FALSE(stream_->write_side_closed());
   EXPECT_TRUE(stream_->OnStreamFrame(frame));
   EXPECT_TRUE(stream_->write_side_closed());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace tools
 }  // namespace net