QUIC - Cache the connection type and connection description. Make the

net/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/quic/quic_client_session.h"
 
 #include <vector>
 
 #include "base/base64.h"
 #include "base/files/file_path.h"
 #include "base/rand_util.h"
 #include "net/base/capturing_net_log.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/test_data_directory.h"
 #include "net/cert/cert_verify_result.h"
 #include "net/http/transport_security_state.h"
 #include "net/quic/crypto/aes_128_gcm_12_encrypter.h"
 #include "net/quic/crypto/crypto_protocol.h"
 #include "net/quic/crypto/proof_verifier_chromium.h"
 #include "net/quic/crypto/quic_decrypter.h"
 #include "net/quic/crypto/quic_encrypter.h"
 #include "net/quic/crypto/quic_server_info.h"
+#include "net/quic/network_connection.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/quic/test_tools/quic_client_session_peer.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/quic/test_tools/simple_quic_framer.h"
 #include "net/socket/socket_test_util.h"
 #include "net/spdy/spdy_test_utils.h"
 #include "net/test/cert_test_util.h"
 #include "net/udp/datagram_client_socket.h"
 
 using testing::_;
 
 namespace net {
 namespace test {
 namespace {
 
 const char kServerHostname[] = "www.example.org";
 const uint16 kServerPort = 80;
 
 class QuicClientSessionTest : public ::testing::TestWithParam<QuicVersion> {
  protected:
   QuicClientSessionTest()
       : connection_(
             new PacketSavingConnection(false, SupportedVersions(GetParam()))),
-        session_(connection_, GetSocket().Pass(), nullptr,
+        network_connection_(),
+        session_(connection_,
+                 GetSocket().Pass(),
+                 nullptr,
                  &transport_security_state_,
-                 make_scoped_ptr((QuicServerInfo*)nullptr), DefaultQuicConfig(),
+                 make_scoped_ptr((QuicServerInfo*)nullptr),
+                 DefaultQuicConfig(),
+                 network_connection_.GetDescription(),

[Ryan Hamilton, 2015/02/23 20:42:19]

I think you can just pass in any string you want here. No need to create an
actual NetworkConnection.

[ramant (doing other things), 2015/02/23 21:05:29]

Done.

                  base::MessageLoop::current()->message_loop_proxy().get(),
                  &net_log_) {
     session_.InitializeSession(QuicServerId(kServerHostname, kServerPort,
                                             /*is_secure=*/false,
                                             PRIVACY_MODE_DISABLED),
         &crypto_config_, nullptr);
     // Advance the time, because timers do not like uninitialized times.
     connection_->AdvanceTime(QuicTime::Delta::FromSeconds(1));
   }
 
@@ skipping 12 matching lines @@
     CryptoTestUtils::HandshakeWithFakeServer(
         connection_, session_.GetCryptoStream());
     ASSERT_EQ(OK, callback_.WaitForResult());
   }
 
   PacketSavingConnection* connection_;
   CapturingNetLog net_log_;
   MockClientSocketFactory socket_factory_;
   StaticSocketDataProvider socket_data_;
   TransportSecurityState transport_security_state_;
+  NetworkConnection network_connection_;
   QuicClientSession session_;
   MockClock clock_;
   MockRandom random_;
   QuicConnectionVisitorInterface* visitor_;
   TestCompletionCallback callback_;
   QuicCryptoClientConfig crypto_config_;
 };
 
 INSTANTIATE_TEST_CASE_P(Tests, QuicClientSessionTest,
                         ::testing::ValuesIn(QuicSupportedVersions()));
@@ skipping 134 matching lines @@
   session_.OnProofVerifyDetailsAvailable(details);
   CompleteCryptoHandshake();
   QuicClientSessionPeer::SetChannelIDSent(&session_, true);
 
   EXPECT_TRUE(session_.CanPool("mail.example.org", PRIVACY_MODE_DISABLED));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net