| Index: net/socket/client_socket_pool_base_unittest.cc
|
| diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc
|
| index 1c0b1cff00b0e70f0f293a0ac984998c25282b50..cffa75a32099b95256ebbfd10cf9b8c31002db09 100644
|
| --- a/net/socket/client_socket_pool_base_unittest.cc
|
| +++ b/net/socket/client_socket_pool_base_unittest.cc
|
| @@ -1127,19 +1127,15 @@ TEST_F(ClientSocketPoolBaseTest, BasicAsynchronous) {
|
| EXPECT_TRUE(req.handle()->socket());
|
| req.handle()->Reset();
|
|
|
| - EXPECT_EQ(7u, log.entries().size());
|
| + EXPECT_EQ(5u, log.entries().size());
|
| EXPECT_TRUE(LogContainsBeginEvent(
|
| log.entries(), 0, NetLog::TYPE_SOCKET_POOL));
|
| EXPECT_TRUE(LogContainsBeginEvent(
|
| log.entries(), 1, NetLog::TYPE_SOCKET_POOL_CONNECT_JOB));
|
| EXPECT_TRUE(LogContainsEndEvent(
|
| log.entries(), 2, NetLog::TYPE_SOCKET_POOL_CONNECT_JOB));
|
| - EXPECT_TRUE(LogContainsEvent(
|
| - log.entries(), 3, NetLog::TYPE_CANCELLED, NetLog::PHASE_NONE));
|
| EXPECT_TRUE(LogContainsEndEvent(
|
| - log.entries(), 4, NetLog::TYPE_SOCKET_POOL_CONNECT_JOB));
|
| - EXPECT_TRUE(LogContainsEndEvent(
|
| - log.entries(), 6, NetLog::TYPE_SOCKET_POOL));
|
| + log.entries(), 4, NetLog::TYPE_SOCKET_POOL));
|
| }
|
|
|
| TEST_F(ClientSocketPoolBaseTest,
|
| @@ -1155,19 +1151,15 @@ TEST_F(ClientSocketPoolBaseTest,
|
| EXPECT_EQ(LOAD_STATE_CONNECTING, pool_->GetLoadState("a", req.handle()));
|
| EXPECT_EQ(ERR_CONNECTION_FAILED, req.WaitForResult());
|
|
|
| - EXPECT_EQ(7u, log.entries().size());
|
| + EXPECT_EQ(5u, log.entries().size());
|
| EXPECT_TRUE(LogContainsBeginEvent(
|
| log.entries(), 0, NetLog::TYPE_SOCKET_POOL));
|
| EXPECT_TRUE(LogContainsBeginEvent(
|
| log.entries(), 1, NetLog::TYPE_SOCKET_POOL_CONNECT_JOB));
|
| EXPECT_TRUE(LogContainsEndEvent(
|
| log.entries(), 2, NetLog::TYPE_SOCKET_POOL_CONNECT_JOB));
|
| - EXPECT_TRUE(LogContainsEvent(
|
| - log.entries(), 3, NetLog::TYPE_CANCELLED, NetLog::PHASE_NONE));
|
| EXPECT_TRUE(LogContainsEndEvent(
|
| - log.entries(), 4, NetLog::TYPE_SOCKET_POOL_CONNECT_JOB));
|
| - EXPECT_TRUE(LogContainsEndEvent(
|
| - log.entries(), 6, NetLog::TYPE_SOCKET_POOL));
|
| + log.entries(), 4, NetLog::TYPE_SOCKET_POOL));
|
| }
|
|
|
| TEST_F(ClientSocketPoolBaseTest, TwoRequestsCancelOne) {
|
|
|