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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/socks_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
« no previous file with comments | « net/socket/socks5_client_socket_unittest.cc ('k') | net/socket/ssl_client_socket_openssl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/socks_client_socket_unittest.cc
diff --git a/net/socket/socks_client_socket_unittest.cc b/net/socket/socks_client_socket_unittest.cc
index 920a1efdcf61556dffac34b2eafd9acc5eaaaf4d..ea7f82eb70f00db1d764ae88d42b3bfe4903ed38 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));
« no previous file with comments | « net/socket/socks5_client_socket_unittest.cc ('k') | net/socket/ssl_client_socket_openssl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698