Revert 87066 - Bind() methods for TCP sockets

BUG=80245
TEST=None

Review URL: http://codereview.chromium.org/7004055

TBR=sergeyu@chromium.org
Review URL: http://codereview.chromium.org/7087004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87070 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 47 deletions

diff --git a/net/socket/tcp_server_socket_unittest.cc b/net/socket/tcp_server_socket_unittest.cc
index d30f5a5..d4abe9d 100644
--- a/net/socket/tcp_server_socket_unittest.cc
+++ b/net/socket/tcp_server_socket_unittest.cc
@@ -26,26 +26,13 @@ class TCPServerSocketTest : public PlatformTest {
       : socket_(NULL, NetLog::Source()) {
   }
 
-  void SetUpIPv4() {
+  void SetUp() OVERRIDE {
     IPEndPoint address;
     ParseAddress("127.0.0.1", 0, &address);
     ASSERT_EQ(OK, socket_.Listen(address, kListenBacklog));
     ASSERT_EQ(OK, socket_.GetLocalAddress(&local_address_));
   }
 
-  void SetUpIPv6(bool* success) {
-    IPEndPoint address;
-    ParseAddress("::1", 0, &address);
-    if (socket_.Listen(address, kListenBacklog) != 0) {
-      LOG(ERROR) << "Failed to listen on ::1 - probably because IPv6 is "
-          "disabled. Skipping the test";
-      *success = false;
-      return;
-    }
-    ASSERT_EQ(OK, socket_.GetLocalAddress(&local_address_));
-    *success = true;
-  }
-
   void ParseAddress(std::string ip_str, int port, IPEndPoint* address) {
     IPAddressNumber ip_number;
     bool rv = ParseIPLiteralToNumber(ip_str, &ip_number);
@@ -73,8 +60,6 @@ class TCPServerSocketTest : public PlatformTest {
 };
 
 TEST_F(TCPServerSocketTest, Accept) {
-  ASSERT_NO_FATAL_FAILURE(SetUpIPv4());
-
   TestCompletionCallback connect_callback;
   TCPClientSocket connecting_socket(local_address_list(),
                                     NULL, NetLog::Source());
@@ -98,8 +83,6 @@ TEST_F(TCPServerSocketTest, Accept) {
 
 // Test Accept() callback.
 TEST_F(TCPServerSocketTest, AcceptAsync) {
-  ASSERT_NO_FATAL_FAILURE(SetUpIPv4());
-
   TestCompletionCallback accept_callback;
   scoped_ptr<StreamSocket> accepted_socket;
 
@@ -122,8 +105,6 @@ TEST_F(TCPServerSocketTest, AcceptAsync) {
 
 // Accept two connections simultaneously.
 TEST_F(TCPServerSocketTest, Accept2Connections) {
-  ASSERT_NO_FATAL_FAILURE(SetUpIPv4());
-
   TestCompletionCallback accept_callback;
   scoped_ptr<StreamSocket> accepted_socket;
 
@@ -161,33 +142,6 @@ TEST_F(TCPServerSocketTest, Accept2Connections) {
             local_address_.address());
 }
 
-TEST_F(TCPServerSocketTest, AcceptIPv6) {
-  bool initialized;
-  ASSERT_NO_FATAL_FAILURE(SetUpIPv6(&initialized));
-  if (!initialized)
-    return;
-
-  TestCompletionCallback connect_callback;
-  TCPClientSocket connecting_socket(local_address_list(),
-                                    NULL, NetLog::Source());
-  connecting_socket.Connect(&connect_callback);
-
-  TestCompletionCallback accept_callback;
-  scoped_ptr<StreamSocket> accepted_socket;
-  int result = socket_.Accept(&accepted_socket, &accept_callback);
-  if (result == ERR_IO_PENDING)
-    result = accept_callback.WaitForResult();
-  ASSERT_EQ(OK, result);
-
-  ASSERT_TRUE(accepted_socket.get() != NULL);
-
-  // Both sockets should be on the loopback network interface.
-  EXPECT_EQ(GetPeerAddress(accepted_socket.get()).address(),
-            local_address_.address());
-
-  EXPECT_EQ(OK, connect_callback.WaitForResult());
-}
-
 }  // namespace
 
 }  // namespace net