diff options
Diffstat (limited to 'net/socket/ssl_client_socket_unittest.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_unittest.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc index 10f33ec..d55dc78 100644 --- a/net/socket/ssl_client_socket_unittest.cc +++ b/net/socket/ssl_client_socket_unittest.cc @@ -63,7 +63,7 @@ class SSLClientSocketTest : public PlatformTest { // timeout. This means that an SSL connect end event may appear as a socket // write. static bool LogContainsSSLConnectEndEvent( - const net::CapturingNetLog::EntryList& log, int i) { + const net::CapturingNetLog::CapturedEntryList& log, int i) { return net::LogContainsEndEvent(log, i, net::NetLog::TYPE_SSL_CONNECT) || net::LogContainsEvent(log, i, net::NetLog::TYPE_SOCKET_BYTES_SENT, net::NetLog::PHASE_NONE); @@ -95,7 +95,7 @@ TEST_F(SSLClientSocketTest, Connect) { rv = sock->Connect(callback.callback()); - net::CapturingNetLog::EntryList entries; + net::CapturingNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_TRUE(net::LogContainsBeginEvent( entries, 5, net::NetLog::TYPE_SSL_CONNECT)); @@ -138,7 +138,7 @@ TEST_F(SSLClientSocketTest, ConnectExpired) { rv = sock->Connect(callback.callback()); - net::CapturingNetLog::EntryList entries; + net::CapturingNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_TRUE(net::LogContainsBeginEvent( entries, 5, net::NetLog::TYPE_SSL_CONNECT)); @@ -183,7 +183,7 @@ TEST_F(SSLClientSocketTest, ConnectMismatched) { rv = sock->Connect(callback.callback()); - net::CapturingNetLog::EntryList entries; + net::CapturingNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_TRUE(net::LogContainsBeginEvent( entries, 5, net::NetLog::TYPE_SSL_CONNECT)); @@ -228,7 +228,7 @@ TEST_F(SSLClientSocketTest, ConnectClientAuthCertRequested) { rv = sock->Connect(callback.callback()); - net::CapturingNetLog::EntryList entries; + net::CapturingNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_TRUE(net::LogContainsBeginEvent( entries, 5, net::NetLog::TYPE_SSL_CONNECT)); @@ -294,7 +294,7 @@ TEST_F(SSLClientSocketTest, ConnectClientAuthSendNullCert) { // TODO(davidben): Add a test which requires them and verify the error. rv = sock->Connect(callback.callback()); - net::CapturingNetLog::EntryList entries; + net::CapturingNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_TRUE(net::LogContainsBeginEvent( entries, 5, net::NetLog::TYPE_SSL_CONNECT)); @@ -581,7 +581,7 @@ TEST_F(SSLClientSocketTest, Read_FullLogging) { rv = callback.WaitForResult(); EXPECT_EQ(static_cast<int>(arraysize(request_text) - 1), rv); - net::CapturingNetLog::EntryList entries; + net::CapturingNetLog::CapturedEntryList entries; log.GetEntries(&entries); size_t last_index = net::ExpectLogContainsSomewhereAfter( entries, 5, net::NetLog::TYPE_SSL_SOCKET_BYTES_SENT, @@ -696,7 +696,7 @@ TEST_F(SSLClientSocketTest, CipherSuiteDisables) { EXPECT_FALSE(sock->IsConnected()); rv = sock->Connect(callback.callback()); - net::CapturingNetLog::EntryList entries; + net::CapturingNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_TRUE(net::LogContainsBeginEvent( entries, 5, net::NetLog::TYPE_SSL_CONNECT)); @@ -892,7 +892,7 @@ TEST_F(SSLClientSocketTest, VerifyReturnChainProperlyOrdered) { EXPECT_FALSE(sock->IsConnected()); rv = sock->Connect(callback.callback()); - net::CapturingNetLog::EntryList entries; + net::CapturingNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_TRUE(net::LogContainsBeginEvent( entries, 5, net::NetLog::TYPE_SSL_CONNECT)); |