diff options
Diffstat (limited to 'net/socket/socks_client_socket_unittest.cc')
| -rw-r--r-- | net/socket/socks_client_socket_unittest.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/net/socket/socks_client_socket_unittest.cc b/net/socket/socks_client_socket_unittest.cc index 920a1ef..ea7f82e 100644 --- a/net/socket/socks_client_socket_unittest.cc +++ b/net/socket/socks_client_socket_unittest.cc @@ -144,7 +144,7 @@ TEST_F(SOCKSClientSocketTest, CompleteHandshake) { MockRead data_reads[] = { MockRead(ASYNC, kSOCKSOkReply, arraysize(kSOCKSOkReply)), MockRead(ASYNC, payload_read.data(), payload_read.size()) }; - CapturingNetLog log; + TestNetLog log; user_sock_ = BuildMockSocket(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes), @@ -159,7 +159,7 @@ TEST_F(SOCKSClientSocketTest, CompleteHandshake) { int rv = user_sock_->Connect(callback_.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); - CapturingNetLog::CapturedEntryList entries; + TestNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_TRUE( LogContainsBeginEvent(entries, 0, NetLog::TYPE_SOCKS_CONNECT)); @@ -220,7 +220,7 @@ TEST_F(SOCKSClientSocketTest, HandshakeFailures) { MockRead data_reads[] = { MockRead(SYNCHRONOUS, tests[i].fail_reply, arraysize(tests[i].fail_reply)) }; - CapturingNetLog log; + TestNetLog log; user_sock_ = BuildMockSocket(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes), @@ -231,7 +231,7 @@ TEST_F(SOCKSClientSocketTest, HandshakeFailures) { int rv = user_sock_->Connect(callback_.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); - CapturingNetLog::CapturedEntryList entries; + TestNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_TRUE(LogContainsBeginEvent( entries, 0, NetLog::TYPE_SOCKS_CONNECT)); @@ -257,7 +257,7 @@ TEST_F(SOCKSClientSocketTest, PartialServerReads) { MockRead data_reads[] = { MockRead(ASYNC, kSOCKSPartialReply1, arraysize(kSOCKSPartialReply1)), MockRead(ASYNC, kSOCKSPartialReply2, arraysize(kSOCKSPartialReply2)) }; - CapturingNetLog log; + TestNetLog log; user_sock_ = BuildMockSocket(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes), @@ -267,7 +267,7 @@ TEST_F(SOCKSClientSocketTest, PartialServerReads) { int rv = user_sock_->Connect(callback_.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); - CapturingNetLog::CapturedEntryList entries; + TestNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_TRUE(LogContainsBeginEvent( entries, 0, NetLog::TYPE_SOCKS_CONNECT)); @@ -295,7 +295,7 @@ TEST_F(SOCKSClientSocketTest, PartialClientWrites) { }; MockRead data_reads[] = { MockRead(ASYNC, kSOCKSOkReply, arraysize(kSOCKSOkReply)) }; - CapturingNetLog log; + TestNetLog log; user_sock_ = BuildMockSocket(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes), @@ -305,7 +305,7 @@ TEST_F(SOCKSClientSocketTest, PartialClientWrites) { int rv = user_sock_->Connect(callback_.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); - CapturingNetLog::CapturedEntryList entries; + TestNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_TRUE(LogContainsBeginEvent( entries, 0, NetLog::TYPE_SOCKS_CONNECT)); @@ -327,7 +327,7 @@ TEST_F(SOCKSClientSocketTest, FailedSocketRead) { MockRead(ASYNC, kSOCKSOkReply, arraysize(kSOCKSOkReply) - 2), // close connection unexpectedly MockRead(SYNCHRONOUS, 0) }; - CapturingNetLog log; + TestNetLog log; user_sock_ = BuildMockSocket(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes), @@ -337,7 +337,7 @@ TEST_F(SOCKSClientSocketTest, FailedSocketRead) { int rv = user_sock_->Connect(callback_.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); - CapturingNetLog::CapturedEntryList entries; + TestNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_TRUE(LogContainsBeginEvent( entries, 0, NetLog::TYPE_SOCKS_CONNECT)); @@ -357,7 +357,7 @@ TEST_F(SOCKSClientSocketTest, FailedDNS) { host_resolver_->rules()->AddSimulatedFailure(hostname); - CapturingNetLog log; + TestNetLog log; user_sock_ = BuildMockSocket(NULL, 0, NULL, 0, @@ -367,7 +367,7 @@ TEST_F(SOCKSClientSocketTest, FailedDNS) { int rv = user_sock_->Connect(callback_.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); - CapturingNetLog::CapturedEntryList entries; + TestNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_TRUE(LogContainsBeginEvent( entries, 0, NetLog::TYPE_SOCKS_CONNECT)); |