| Index: net/socket/socks_client_socket_unittest.cc
|
| ===================================================================
|
| --- net/socket/socks_client_socket_unittest.cc (revision 141266)
|
| +++ net/socket/socks_client_socket_unittest.cc (working copy)
|
| @@ -132,7 +132,7 @@
|
| MockRead data_reads[] = {
|
| MockRead(ASYNC, kSOCKSOkReply, arraysize(kSOCKSOkReply)),
|
| MockRead(ASYNC, payload_read.data(), payload_read.size()) };
|
| - CapturingNetLog log(CapturingNetLog::kUnbounded);
|
| + CapturingNetLog log;
|
|
|
| user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
|
| data_writes, arraysize(data_writes),
|
| @@ -147,7 +147,7 @@
|
| int rv = user_sock_->Connect(callback_.callback());
|
| EXPECT_EQ(ERR_IO_PENDING, rv);
|
|
|
| - net::CapturingNetLog::CapturedEntryList entries;
|
| + CapturingNetLog::CapturedEntryList entries;
|
| log.GetEntries(&entries);
|
| EXPECT_TRUE(
|
| LogContainsBeginEvent(entries, 0, NetLog::TYPE_SOCKS_CONNECT));
|
| @@ -206,7 +206,7 @@
|
| MockRead data_reads[] = {
|
| MockRead(SYNCHRONOUS, tests[i].fail_reply,
|
| arraysize(tests[i].fail_reply)) };
|
| - CapturingNetLog log(CapturingNetLog::kUnbounded);
|
| + CapturingNetLog log;
|
|
|
| user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
|
| data_writes, arraysize(data_writes),
|
| @@ -217,7 +217,7 @@
|
| int rv = user_sock_->Connect(callback_.callback());
|
| EXPECT_EQ(ERR_IO_PENDING, rv);
|
|
|
| - net::CapturingNetLog::CapturedEntryList entries;
|
| + CapturingNetLog::CapturedEntryList entries;
|
| log.GetEntries(&entries);
|
| EXPECT_TRUE(LogContainsBeginEvent(
|
| entries, 0, NetLog::TYPE_SOCKS_CONNECT));
|
| @@ -243,7 +243,7 @@
|
| MockRead data_reads[] = {
|
| MockRead(ASYNC, kSOCKSPartialReply1, arraysize(kSOCKSPartialReply1)),
|
| MockRead(ASYNC, kSOCKSPartialReply2, arraysize(kSOCKSPartialReply2)) };
|
| - CapturingNetLog log(CapturingNetLog::kUnbounded);
|
| + CapturingNetLog log;
|
|
|
| user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
|
| data_writes, arraysize(data_writes),
|
| @@ -253,7 +253,7 @@
|
|
|
| int rv = user_sock_->Connect(callback_.callback());
|
| EXPECT_EQ(ERR_IO_PENDING, rv);
|
| - net::CapturingNetLog::CapturedEntryList entries;
|
| + CapturingNetLog::CapturedEntryList entries;
|
| log.GetEntries(&entries);
|
| EXPECT_TRUE(LogContainsBeginEvent(
|
| entries, 0, NetLog::TYPE_SOCKS_CONNECT));
|
| @@ -281,7 +281,7 @@
|
| arraysize(kSOCKSPartialRequest2)) };
|
| MockRead data_reads[] = {
|
| MockRead(ASYNC, kSOCKSOkReply, arraysize(kSOCKSOkReply)) };
|
| - CapturingNetLog log(CapturingNetLog::kUnbounded);
|
| + CapturingNetLog log;
|
|
|
| user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
|
| data_writes, arraysize(data_writes),
|
| @@ -291,7 +291,7 @@
|
|
|
| int rv = user_sock_->Connect(callback_.callback());
|
| EXPECT_EQ(ERR_IO_PENDING, rv);
|
| - net::CapturingNetLog::CapturedEntryList entries;
|
| + CapturingNetLog::CapturedEntryList entries;
|
| log.GetEntries(&entries);
|
| EXPECT_TRUE(LogContainsBeginEvent(
|
| entries, 0, NetLog::TYPE_SOCKS_CONNECT));
|
| @@ -313,7 +313,7 @@
|
| MockRead(ASYNC, kSOCKSOkReply, arraysize(kSOCKSOkReply) - 2),
|
| // close connection unexpectedly
|
| MockRead(SYNCHRONOUS, 0) };
|
| - CapturingNetLog log(CapturingNetLog::kUnbounded);
|
| + CapturingNetLog log;
|
|
|
| user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads),
|
| data_writes, arraysize(data_writes),
|
| @@ -323,7 +323,7 @@
|
|
|
| int rv = user_sock_->Connect(callback_.callback());
|
| EXPECT_EQ(ERR_IO_PENDING, rv);
|
| - net::CapturingNetLog::CapturedEntryList entries;
|
| + CapturingNetLog::CapturedEntryList entries;
|
| log.GetEntries(&entries);
|
| EXPECT_TRUE(LogContainsBeginEvent(
|
| entries, 0, NetLog::TYPE_SOCKS_CONNECT));
|
| @@ -343,7 +343,7 @@
|
|
|
| host_resolver_->rules()->AddSimulatedFailure(hostname);
|
|
|
| - CapturingNetLog log(CapturingNetLog::kUnbounded);
|
| + CapturingNetLog log;
|
|
|
| user_sock_.reset(BuildMockSocket(NULL, 0,
|
| NULL, 0,
|
| @@ -353,7 +353,7 @@
|
|
|
| int rv = user_sock_->Connect(callback_.callback());
|
| EXPECT_EQ(ERR_IO_PENDING, rv);
|
| - net::CapturingNetLog::CapturedEntryList entries;
|
| + CapturingNetLog::CapturedEntryList entries;
|
| log.GetEntries(&entries);
|
| EXPECT_TRUE(LogContainsBeginEvent(
|
| entries, 0, NetLog::TYPE_SOCKS_CONNECT));
|
|
|