Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Side by Side Diff: net/quic/quic_client_session_test.cc

Issue 1084533002: Rename NetLogLogger and CapturingNetLog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename NetLogLogger and CapturingNetLog(removed compiler error for chromeOS) Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/proxy/proxy_service_unittest.cc ('k') | net/quic/quic_network_transaction_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/quic/quic_client_session.h" 5 #include "net/quic/quic_client_session.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/rand_util.h" 11 #include "base/rand_util.h"
12 #include "net/base/test_completion_callback.h" 12 #include "net/base/test_completion_callback.h"
13 #include "net/base/test_data_directory.h" 13 #include "net/base/test_data_directory.h"
14 #include "net/cert/cert_verify_result.h" 14 #include "net/cert/cert_verify_result.h"
15 #include "net/http/transport_security_state.h" 15 #include "net/http/transport_security_state.h"
16 #include "net/log/capturing_net_log.h" 16 #include "net/log/test_net_log.h"
17 #include "net/quic/crypto/aes_128_gcm_12_encrypter.h" 17 #include "net/quic/crypto/aes_128_gcm_12_encrypter.h"
18 #include "net/quic/crypto/crypto_protocol.h" 18 #include "net/quic/crypto/crypto_protocol.h"
19 #include "net/quic/crypto/proof_verifier_chromium.h" 19 #include "net/quic/crypto/proof_verifier_chromium.h"
20 #include "net/quic/crypto/quic_decrypter.h" 20 #include "net/quic/crypto/quic_decrypter.h"
21 #include "net/quic/crypto/quic_encrypter.h" 21 #include "net/quic/crypto/quic_encrypter.h"
22 #include "net/quic/crypto/quic_server_info.h" 22 #include "net/quic/crypto/quic_server_info.h"
23 #include "net/quic/test_tools/crypto_test_utils.h" 23 #include "net/quic/test_tools/crypto_test_utils.h"
24 #include "net/quic/test_tools/quic_client_session_peer.h" 24 #include "net/quic/test_tools/quic_client_session_peer.h"
25 #include "net/quic/test_tools/quic_test_utils.h" 25 #include "net/quic/test_tools/quic_test_utils.h"
26 #include "net/quic/test_tools/simple_quic_framer.h" 26 #include "net/quic/test_tools/simple_quic_framer.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 74
75 void CompleteCryptoHandshake() { 75 void CompleteCryptoHandshake() {
76 ASSERT_EQ(ERR_IO_PENDING, 76 ASSERT_EQ(ERR_IO_PENDING,
77 session_.CryptoConnect(false, callback_.callback())); 77 session_.CryptoConnect(false, callback_.callback()));
78 CryptoTestUtils::HandshakeWithFakeServer( 78 CryptoTestUtils::HandshakeWithFakeServer(
79 connection_, session_.GetCryptoStream()); 79 connection_, session_.GetCryptoStream());
80 ASSERT_EQ(OK, callback_.WaitForResult()); 80 ASSERT_EQ(OK, callback_.WaitForResult());
81 } 81 }
82 82
83 PacketSavingConnection* connection_; 83 PacketSavingConnection* connection_;
84 CapturingNetLog net_log_; 84 TestNetLog net_log_;
85 MockClientSocketFactory socket_factory_; 85 MockClientSocketFactory socket_factory_;
86 StaticSocketDataProvider socket_data_; 86 StaticSocketDataProvider socket_data_;
87 TransportSecurityState transport_security_state_; 87 TransportSecurityState transport_security_state_;
88 QuicClientSession session_; 88 QuicClientSession session_;
89 MockClock clock_; 89 MockClock clock_;
90 MockRandom random_; 90 MockRandom random_;
91 QuicConnectionVisitorInterface* visitor_; 91 QuicConnectionVisitorInterface* visitor_;
92 TestCompletionCallback callback_; 92 TestCompletionCallback callback_;
93 QuicCryptoClientConfig crypto_config_; 93 QuicCryptoClientConfig crypto_config_;
94 }; 94 };
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 session_.OnProofVerifyDetailsAvailable(details); 232 session_.OnProofVerifyDetailsAvailable(details);
233 CompleteCryptoHandshake(); 233 CompleteCryptoHandshake();
234 QuicClientSessionPeer::SetChannelIDSent(&session_, true); 234 QuicClientSessionPeer::SetChannelIDSent(&session_, true);
235 235
236 EXPECT_TRUE(session_.CanPool("mail.example.org", PRIVACY_MODE_DISABLED)); 236 EXPECT_TRUE(session_.CanPool("mail.example.org", PRIVACY_MODE_DISABLED));
237 } 237 }
238 238
239 } // namespace 239 } // namespace
240 } // namespace test 240 } // namespace test
241 } // namespace net 241 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/proxy_service_unittest.cc ('k') | net/quic/quic_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698