Clean up net unit testing code.

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
index f283cb015745a9f4eafef125a566218d2d3f974a..f54fc319a055ac1c5ae31fdc197eccce3b245d5b 100644
--- a/net/base/listen_socket_unittest.h
+++ b/net/base/listen_socket_unittest.h
@@ -68,24 +68,11 @@ class ListenSocketTester :
     public ListenSocket::ListenSocketDelegate,
     public base::RefCountedThreadSafe<ListenSocketTester> {
 
- protected:
-  friend class base::RefCountedThreadSafe<ListenSocketTester>;
-
-  virtual ~ListenSocketTester() {}
-
-  virtual ListenSocket* DoListen();
-
  public:
-  ListenSocketTester()
-      : thread_(NULL),
-        loop_(NULL),
-        server_(NULL),
-        connection_(NULL),
-        cv_(&lock_) {
-  }
+  ListenSocketTester();
 
-  virtual void SetUp();
-  virtual void TearDown();
+  void SetUp();
+  void TearDown();
 
   void ReportAction(const ListenSocketTestAction& action);
   void NextAction();
@@ -96,10 +83,6 @@ class ListenSocketTester :
   void Shutdown();
   void Listen();
   void SendFromTester();
-  virtual void DidAccept(ListenSocket *server, ListenSocket *connection);
-  virtual void DidRead(ListenSocket *connection, const char* data, int len);
-  virtual void DidClose(ListenSocket *sock);
-  virtual bool Send(SOCKET sock, const std::string& str);
   // verify the send/read from client to server
   void TestClientSend();
   // verify send/read of a longer string
@@ -107,6 +90,13 @@ class ListenSocketTester :
   // 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);
+  virtual void DidRead(ListenSocket *connection, const char* data, int len);
+  virtual void DidClose(ListenSocket *sock);
+
   scoped_ptr<base::Thread> thread_;
   MessageLoopForIO* loop_;
   ListenSocket* server_;
@@ -119,6 +109,13 @@ class ListenSocketTester :
   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();
 };
 
 #endif  // NET_BASE_LISTEN_SOCKET_UNITTEST_H_