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

Unified Diff: net/socket/client_socket_pool_base_unittest.cc

Issue 10546071: CapturingNetLog - remove maximum entries constructor argument. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 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/client_socket_pool_base_unittest.cc
===================================================================
--- net/socket/client_socket_pool_base_unittest.cc (revision 140196)
+++ net/socket/client_socket_pool_base_unittest.cc (working copy)
@@ -762,7 +762,7 @@
TEST_F(ClientSocketPoolBaseTest, ConnectJob_TimedOut) {
TestConnectJobDelegate delegate;
ClientSocketHandle ignored;
- CapturingNetLog log(CapturingNetLog::kUnbounded);
+ CapturingNetLog log;
TestClientSocketPoolBase::Request request(
&ignored, CompletionCallback(), kDefaultPriority,
@@ -781,7 +781,7 @@
base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(1));
EXPECT_EQ(ERR_TIMED_OUT, delegate.WaitForResult());
- net::CapturingNetLog::CapturedEntryList entries;
+ CapturingNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(6u, entries.size());
@@ -806,7 +806,7 @@
TestCompletionCallback callback;
ClientSocketHandle handle;
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
EXPECT_EQ(OK,
handle.Init("a",
@@ -819,7 +819,7 @@
EXPECT_TRUE(handle.socket());
handle.Reset();
- net::CapturingNetLog::CapturedEntryList entries;
+ CapturingNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(4u, entries.size());
@@ -839,7 +839,7 @@
CreatePool(kDefaultMaxSockets, kDefaultMaxSocketsPerGroup);
connect_job_factory_->set_job_type(TestConnectJob::kMockFailingJob);
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
ClientSocketHandle handle;
TestCompletionCallback callback;
@@ -859,7 +859,7 @@
EXPECT_FALSE(handle.is_ssl_error());
EXPECT_TRUE(handle.ssl_error_response_info().headers.get() == NULL);
- net::CapturingNetLog::CapturedEntryList entries;
+ CapturingNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(3u, entries.size());
@@ -1669,7 +1669,7 @@
connect_job_factory_->set_job_type(TestConnectJob::kMockPendingJob);
ClientSocketHandle handle;
TestCompletionCallback callback;
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
int rv = handle.Init("a",
params_,
LOWEST,
@@ -1683,7 +1683,7 @@
EXPECT_TRUE(handle.socket());
handle.Reset();
- net::CapturingNetLog::CapturedEntryList entries;
+ CapturingNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(4u, entries.size());
@@ -1706,7 +1706,7 @@
connect_job_factory_->set_job_type(TestConnectJob::kMockPendingFailingJob);
ClientSocketHandle handle;
TestCompletionCallback callback;
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
// Set the additional error state members to ensure that they get cleared.
handle.set_is_ssl_error(true);
HttpResponseInfo info;
@@ -1723,7 +1723,7 @@
EXPECT_FALSE(handle.is_ssl_error());
EXPECT_TRUE(handle.ssl_error_response_info().headers.get() == NULL);
- net::CapturingNetLog::CapturedEntryList entries;
+ CapturingNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(3u, entries.size());
@@ -1754,7 +1754,7 @@
callback.callback(),
pool_.get(),
BoundNetLog()));
- CapturingBoundNetLog log2(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log2;
EXPECT_EQ(ERR_IO_PENDING,
handle2.Init("a",
params_,
@@ -2041,7 +2041,7 @@
// Request a new socket. This should reuse the old socket and complete
// synchronously.
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
rv = handle.Init("a",
params_,
LOWEST,
@@ -2055,7 +2055,7 @@
EXPECT_EQ(0, pool_->IdleSocketCountInGroup("a"));
EXPECT_EQ(1, pool_->NumActiveSocketsInGroup("a"));
- net::CapturingNetLog::CapturedEntryList entries;
+ CapturingNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
EXPECT_TRUE(LogContainsEntryWithType(
entries, 1, NetLog::TYPE_SOCKET_POOL_REUSED_AN_EXISTING_SOCKET));
@@ -2120,7 +2120,7 @@
// Request a new socket. This should cleanup the unused and timed out ones.
// A new socket will be created rather than reusing the idle one.
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
TestCompletionCallback callback3;
rv = handle.Init("a",
params_,
@@ -2137,7 +2137,7 @@
EXPECT_EQ(0, pool_->IdleSocketCountInGroup("a"));
EXPECT_EQ(1, pool_->NumActiveSocketsInGroup("a"));
- net::CapturingNetLog::CapturedEntryList entries;
+ CapturingNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
EXPECT_FALSE(LogContainsEntryWithType(
entries, 1, NetLog::TYPE_SOCKET_POOL_REUSED_AN_EXISTING_SOCKET));
@@ -2199,7 +2199,7 @@
// used socket. Request it to make sure that it's used.
pool_->CleanupTimedOutIdleSockets();
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
rv = handle.Init("a",
params_,
LOWEST,
@@ -2209,7 +2209,7 @@
EXPECT_EQ(OK, rv);
EXPECT_TRUE(handle.is_reused());
- net::CapturingNetLog::CapturedEntryList entries;
+ CapturingNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
EXPECT_TRUE(LogContainsEntryWithType(
entries, 1, NetLog::TYPE_SOCKET_POOL_REUSED_AN_EXISTING_SOCKET));

Powered by Google App Engine
This is Rietveld 408576698