| Index: net/socket/client_socket_pool_base_unittest.cc
|
| ===================================================================
|
| --- net/socket/client_socket_pool_base_unittest.cc (revision 141266)
|
| +++ net/socket/client_socket_pool_base_unittest.cc (working copy)
|
| @@ -766,7 +766,7 @@
|
| TEST_F(ClientSocketPoolBaseTest, ConnectJob_TimedOut) {
|
| TestConnectJobDelegate delegate;
|
| ClientSocketHandle ignored;
|
| - CapturingNetLog log(CapturingNetLog::kUnbounded);
|
| + CapturingNetLog log;
|
|
|
| TestClientSocketPoolBase::Request request(
|
| &ignored, CompletionCallback(), kDefaultPriority,
|
| @@ -785,7 +785,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());
|
| @@ -810,7 +810,7 @@
|
|
|
| TestCompletionCallback callback;
|
| ClientSocketHandle handle;
|
| - CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
|
| + CapturingBoundNetLog log;
|
|
|
| EXPECT_EQ(OK,
|
| handle.Init("a",
|
| @@ -823,7 +823,7 @@
|
| EXPECT_TRUE(handle.socket());
|
| handle.Reset();
|
|
|
| - net::CapturingNetLog::CapturedEntryList entries;
|
| + CapturingNetLog::CapturedEntryList entries;
|
| log.GetEntries(&entries);
|
|
|
| EXPECT_EQ(4u, entries.size());
|
| @@ -843,7 +843,7 @@
|
| CreatePool(kDefaultMaxSockets, kDefaultMaxSocketsPerGroup);
|
|
|
| connect_job_factory_->set_job_type(TestConnectJob::kMockFailingJob);
|
| - CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
|
| + CapturingBoundNetLog log;
|
|
|
| ClientSocketHandle handle;
|
| TestCompletionCallback callback;
|
| @@ -863,7 +863,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());
|
| @@ -1676,7 +1676,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,
|
| @@ -1690,7 +1690,7 @@
|
| EXPECT_TRUE(handle.socket());
|
| handle.Reset();
|
|
|
| - net::CapturingNetLog::CapturedEntryList entries;
|
| + CapturingNetLog::CapturedEntryList entries;
|
| log.GetEntries(&entries);
|
|
|
| EXPECT_EQ(4u, entries.size());
|
| @@ -1713,7 +1713,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;
|
| @@ -1730,7 +1730,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());
|
| @@ -1761,7 +1761,7 @@
|
| callback.callback(),
|
| pool_.get(),
|
| BoundNetLog()));
|
| - CapturingBoundNetLog log2(CapturingNetLog::kUnbounded);
|
| + CapturingBoundNetLog log2;
|
| EXPECT_EQ(ERR_IO_PENDING,
|
| handle2.Init("a",
|
| params_,
|
| @@ -2048,7 +2048,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,
|
| @@ -2062,7 +2062,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));
|
| @@ -2127,7 +2127,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_,
|
| @@ -2144,7 +2144,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));
|
| @@ -2206,7 +2206,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,
|
| @@ -2216,7 +2216,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));
|
|
|