Revert everything related to the relanding.

net/base/listen_socket_unittest.h

 // 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.
 
 #ifndef NET_BASE_LISTEN_SOCKET_UNITTEST_H_
 #define NET_BASE_LISTEN_SOCKET_UNITTEST_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <winsock2.h>
 #elif defined(OS_POSIX)
 #include <sys/socket.h>
 #include <errno.h>
 #include <semaphore.h>
 #include <arpa/inet.h>
 #endif
 
-#include "base/scoped_ptr.h"
 #include "base/thread.h"
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "net/base/net_util.h"
 #include "net/base/listen_socket.h"
 #include "net/base/winsock_init.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 87 matching lines @@
   MessageLoopForIO* loop_;
   ListenSocket* server_;
   ListenSocket* connection_;
   ListenSocketTestAction last_action_;
   std::deque<ListenSocketTestAction> queue_;
   SOCKET test_socket_;
   static const int kTestPort;
 };
 
 #endif  // NET_BASE_LISTEN_SOCKET_UNITTEST_H_