Upstream changes making ListenSocket an abstract class.

net/base/listen_socket_unittest.h

Index: net/base/listen_socket_unittest.h
diff --git a/net/base/listen_socket_unittest.h b/net/base/listen_socket_unittest.h
deleted file mode 100644
index 1f63bc919a2d7398d5152e4d5f1250f0ad5ce7b1..0000000000000000000000000000000000000000
--- a/net/base/listen_socket_unittest.h
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright (c) 2011 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_
-#pragma once
-
-#include "build/build_config.h"
-
-#if defined(OS_WIN)
-#include <winsock2.h>
-#elif defined(OS_POSIX)
-#include <sys/socket.h>
-#include <errno.h>
-#include <arpa/inet.h>
-#endif
-
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/message_loop.h"
-#include "base/string_util.h"
-#include "base/synchronization/condition_variable.h"
-#include "base/synchronization/lock.h"
-#include "base/threading/thread.h"
-#include "net/base/listen_socket.h"
-#include "net/base/net_util.h"
-#include "net/base/winsock_init.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-#if defined(OS_POSIX)
-// Used same name as in Windows to avoid #ifdef where referenced
-#define SOCKET int
-const int INVALID_SOCKET = -1;
-const int SOCKET_ERROR = -1;
-#endif
-
-namespace net {
-
-enum ActionType {
-  ACTION_NONE = 0,
-  ACTION_LISTEN = 1,
-  ACTION_ACCEPT = 2,
-  ACTION_READ = 3,
-  ACTION_SEND = 4,
-  ACTION_CLOSE = 5,
-  ACTION_SHUTDOWN = 6
-};
-
-class ListenSocketTestAction {
- public:
-  ListenSocketTestAction() : action_(ACTION_NONE) {}
-  explicit ListenSocketTestAction(ActionType action) : action_(action) {}
-  ListenSocketTestAction(ActionType action, std::string data)
-      : action_(action),
-        data_(data) {}
-
-  const std::string data() const { return data_; }
-  ActionType type() const { return action_; }
-
- private:
-  ActionType action_;
-  std::string data_;
-};
-
-
-// This had to be split out into a separate class because I couldn't
-// make the testing::Test class refcounted.
-class ListenSocketTester :
-    public ListenSocket::ListenSocketDelegate,
-    public base::RefCountedThreadSafe<ListenSocketTester> {
-
- public:
-  ListenSocketTester();
-
-  void SetUp();
-  void TearDown();
-
-  void ReportAction(const ListenSocketTestAction& action);
-  void NextAction();
-
-  // read all pending data from the test socket
-  int ClearTestSocket();
-  // Release the connection and server sockets
-  void Shutdown();
-  void Listen();
-  void SendFromTester();
-  // verify the send/read from client to server
-  void TestClientSend();
-  // verify send/read of a longer string
-  void TestClientSendLong();
-  // verify a send/read from server to client
-  void TestServerSend();
-
-  virtual bool Send(SOCKET sock, const std::string& str);
-
-  // ListenSocket::ListenSocketDelegate:
-  virtual void DidAccept(ListenSocket *server,
-                         ListenSocket *connection) OVERRIDE;
-  virtual void DidRead(ListenSocket *connection,
-                       const char* data,
-                       int len) OVERRIDE;
-  virtual void DidClose(ListenSocket *sock) OVERRIDE;
-
-  scoped_ptr<base::Thread> thread_;
-  MessageLoopForIO* loop_;
-  ListenSocket* server_;
-  ListenSocket* connection_;
-  ListenSocketTestAction last_action_;
-
-  SOCKET test_socket_;
-  static const int kTestPort;
-
-  base::Lock lock_;  // protects |queue_| and wraps |cv_|
-  base::ConditionVariable cv_;
-  std::deque<ListenSocketTestAction> queue_;
-
- protected:
-  friend class base::RefCountedThreadSafe<ListenSocketTester>;
-
-  virtual ~ListenSocketTester();
-
-  virtual ListenSocket* DoListen();
-};
-
-}  // namespace net
-
-#endif  // NET_BASE_LISTEN_SOCKET_UNITTEST_H_