net/socket/socks5_client_socket_unittest.cc - Issue 1084533002: Rename NetLogLogger and CapturingNetLog

Unified Diff: net/socket/socks5_client_socket_unittest.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 side-by-side diff with in-line comments

Download patch

Index: net/socket/socks5_client_socket_unittest.cc

diff --git a/net/socket/socks5_client_socket_unittest.cc b/net/socket/socks5_client_socket_unittest.cc

index 6181e4be7cd32bfdcc6c38596be4789a3ec404f5..4ee9681a183b7da1624df8b6592901e61f65d29d 100644

--- a/net/socket/socks5_client_socket_unittest.cc

+++ b/net/socket/socks5_client_socket_unittest.cc

@@ -44,7 +44,7 @@ class SOCKS5ClientSocketTest : public PlatformTest {

protected:

const uint16 kNwPort;

- CapturingNetLog net_log_;

+ TestNetLog net_log_;

scoped_ptr<SOCKS5ClientSocket> user_sock_;

AddressList address_list_;

// Filled in by BuildMockSocket() and owned by its return value

@@ -146,7 +146,7 @@ TEST_F(SOCKS5ClientSocketTest, CompleteHandshake) {

EXPECT_EQ(ERR_IO_PENDING, rv);

EXPECT_FALSE(user_sock_->IsConnected());

- CapturingNetLog::CapturedEntryList net_log_entries;

+ TestNetLog::CapturedEntryList net_log_entries;

net_log_.GetEntries(&net_log_entries);

EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0,

NetLog::TYPE_SOCKS5_CONNECT));

@@ -270,7 +270,7 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) {

int rv = user_sock_->Connect(callback_.callback());

EXPECT_EQ(ERR_IO_PENDING, rv);

- CapturingNetLog::CapturedEntryList net_log_entries;

+ TestNetLog::CapturedEntryList net_log_entries;

net_log_.GetEntries(&net_log_entries);

EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0,

NetLog::TYPE_SOCKS5_CONNECT));

@@ -301,7 +301,7 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) {

int rv = user_sock_->Connect(callback_.callback());

EXPECT_EQ(ERR_IO_PENDING, rv);

- CapturingNetLog::CapturedEntryList net_log_entries;

+ TestNetLog::CapturedEntryList net_log_entries;

net_log_.GetEntries(&net_log_entries);

EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0,

NetLog::TYPE_SOCKS5_CONNECT));

@@ -330,7 +330,7 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) {

hostname, 80, &net_log_);

int rv = user_sock_->Connect(callback_.callback());

EXPECT_EQ(ERR_IO_PENDING, rv);

- CapturingNetLog::CapturedEntryList net_log_entries;

+ TestNetLog::CapturedEntryList net_log_entries;

net_log_.GetEntries(&net_log_entries);

EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0,

NetLog::TYPE_SOCKS5_CONNECT));

@@ -361,7 +361,7 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) {

hostname, 80, &net_log_);

int rv = user_sock_->Connect(callback_.callback());

EXPECT_EQ(ERR_IO_PENDING, rv);

- CapturingNetLog::CapturedEntryList net_log_entries;

+ TestNetLog::CapturedEntryList net_log_entries;

net_log_.GetEntries(&net_log_entries);

EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0,

NetLog::TYPE_SOCKS5_CONNECT));

« no previous file with comments | « net/socket/client_socket_pool_base_unittest.cc ('k') | net/socket/socks_client_socket_unittest.cc » ('j') | no next file with comments »