Revert 46757 - Fix IO thread hang on releasing a socket....

net/socket/client_socket_pool_base_unittest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/client_socket_pool_base.h"
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/platform_thread.h"
@@ skipping 1437 matching lines @@
   req.handle()->Reset();
   req2.handle()->socket()->Disconnect();
   req2.handle()->Reset();
 
   EXPECT_EQ(OK, req3.WaitForResult());
   EXPECT_FALSE(req3.handle()->is_reused());
   EXPECT_EQ(OK, req4.WaitForResult());
   EXPECT_FALSE(req4.handle()->is_reused());
 }
 
-// Regression test for http://crbug.com/42267.
-// When DoReleaseSocket() is processed for one socket, it is blocked because the
-// other stalled groups all have releasing sockets, so no progress can be made.
-TEST_F(ClientSocketPoolBaseTest, SocketLimitReleasingSockets) {
-  CreatePoolWithIdleTimeouts(
-      4 /* socket limit */, 4 /* socket limit per group */,
-      base::TimeDelta(),  // Time out unused sockets immediately.
-      base::TimeDelta::FromDays(1));  // Don't time out used sockets.
-
-  connect_job_factory_->set_job_type(TestConnectJob::kMockJob);
-
-  // Max out the socket limit with 2 per group.
-
-  scoped_ptr<TestSocketRequest> req_a[4];
-  scoped_ptr<TestSocketRequest> req_b[4];
-
-  for (int i = 0; i < 2; ++i) {
-    req_a[i].reset(new TestSocketRequest(&request_order_, &completion_count_));
-    req_b[i].reset(new TestSocketRequest(&request_order_, &completion_count_));
-    EXPECT_EQ(OK,
-              InitHandle(req_a[i]->handle(), "a", LOWEST, req_a[i].get(), pool_,
-                         BoundNetLog()));
-    EXPECT_EQ(OK,
-              InitHandle(req_b[i]->handle(), "b", LOWEST, req_b[i].get(), pool_,
-                         BoundNetLog()));
-  }
-  
-  // Make 4 pending requests, 2 per group.
-
-  for (int i = 2; i < 4; ++i) {
-    req_a[i].reset(new TestSocketRequest(&request_order_, &completion_count_));
-    req_b[i].reset(new TestSocketRequest(&request_order_, &completion_count_));
-    EXPECT_EQ(ERR_IO_PENDING,
-              InitHandle(req_a[i]->handle(), "a", LOWEST, req_a[i].get(), pool_,
-                         BoundNetLog()));
-    EXPECT_EQ(ERR_IO_PENDING,
-              InitHandle(req_b[i]->handle(), "b", LOWEST, req_b[i].get(), pool_,
-                         BoundNetLog()));
-  }
-
-  // Release b's socket first.  The order is important, because in
-  // DoReleaseSocket(), we'll process b's released socket, and since both b and
-  // a are stalled, but 'a' is lower lexicographically, we'll process group 'a'
-  // first, which has a releasing socket, so it refuses to start up another
-  // ConnectJob.  So, we used to infinite loop on this.
-  req_b[0]->handle()->socket()->Disconnect();
-  req_b[0]->handle()->Reset();
-  req_a[0]->handle()->socket()->Disconnect();
-  req_a[0]->handle()->Reset();
-
-  // Used to get stuck here.
-  MessageLoop::current()->RunAllPending();
-
-  req_b[1]->handle()->socket()->Disconnect();
-  req_b[1]->handle()->Reset();
-  req_a[1]->handle()->socket()->Disconnect();
-  req_a[1]->handle()->Reset();
-
-  for (int i = 2; i < 4; ++i) {
-    EXPECT_EQ(OK, req_b[i]->WaitForResult());
-    EXPECT_EQ(OK, req_a[i]->WaitForResult());
-  }
-}
-
 TEST_F(ClientSocketPoolBaseTest,
        ReleasingDisconnectedSocketsMaintainsPriorityOrder) {
   CreatePool(kDefaultMaxSockets, kDefaultMaxSocketsPerGroup);
 
   connect_job_factory_->set_job_type(TestConnectJob::kMockPendingJob);
 
   EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", kDefaultPriority));
   EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", kDefaultPriority));
   EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", kDefaultPriority));
   EXPECT_EQ(ERR_IO_PENDING, StartRequest("a", kDefaultPriority));
@@ skipping 66 matching lines @@
   TestReleasingSocketRequest request(pool_.get());
   EXPECT_EQ(ERR_IO_PENDING, InitHandle(request.handle(), "a", kDefaultPriority,
                                        &request, pool_, BoundNetLog()));
 
   EXPECT_EQ(OK, request.WaitForResult());
 }
 
 }  // namespace
 
 }  // namespace net