Revert 48186, 48196, 48198

net/base/listen_socket_unittest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 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/base/listen_socket_unittest.h"
 
 #include <fcntl.h>
 
 #include "base/eintr_wrapper.h"
 #include "net/base/net_util.h"
 #include "testing/platform_test.h"
@@ skipping 35 matching lines @@
   loop_->PostTask(FROM_HERE, NewRunnableMethod(
       this, &ListenSocketTester::Listen));
 
   // verify Listen succeeded
   ASSERT_TRUE(NextAction(kDefaultTimeoutMs));
   ASSERT_FALSE(server_ == NULL);
   ASSERT_EQ(ACTION_LISTEN, last_action_.type());
 
   // verify the connect/accept and setup test_socket_
   test_socket_ = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-  ASSERT_NE(INVALID_SOCKET, test_socket_);
+  ASSERT_NE(-1, test_socket_);
   struct sockaddr_in client;
   client.sin_family = AF_INET;
   client.sin_addr.s_addr = inet_addr(kLoopback);
   client.sin_port = htons(kTestPort);
   int ret =
       HANDLE_EINTR(connect(test_socket_, reinterpret_cast<sockaddr*>(&client),
                            sizeof(client)));
   ASSERT_NE(ret, SOCKET_ERROR);
 
   net::SetNonBlocking(test_socket_);
@@ skipping 245 matching lines @@
   tester_->TestClientSend();
 }
 
 TEST_F(ListenSocketTest, ClientSendLong) {
   tester_->TestClientSendLong();
 }
 
 TEST_F(ListenSocketTest, ServerSend) {
   tester_->TestServerSend();
 }