Reapply r72562 with willchan's nits + locally tested shlib fixes.

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_
 #pragma once
 
 #include "build/build_config.h"
 
@@ skipping 50 matching lines @@
   std::string data_;
 };
 
 
 // This had to be split out into a separate class because I couldn't
 // make a the testing::Test class refcounted.
 class ListenSocketTester :
     public ListenSocket::ListenSocketDelegate,
     public base::RefCountedThreadSafe<ListenSocketTester> {
 
- protected:
-  friend class base::RefCountedThreadSafe<ListenSocketTester>;
+ public:
+  ListenSocketTester();
 
-  virtual ~ListenSocketTester() {}
-
-  virtual ListenSocket* DoListen();
-
- public:
-  ListenSocketTester()
-      : thread_(NULL),
-        loop_(NULL),
-        server_(NULL),
-        connection_(NULL),
-        cv_(&lock_) {
-  }
-
-  virtual void SetUp();
-  virtual void TearDown();
+  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();
-  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
   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);
+  virtual void DidRead(ListenSocket *connection, const char* data, int len);
+  virtual void DidClose(ListenSocket *sock);
+
   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();
 };
 
 #endif  // NET_BASE_LISTEN_SOCKET_UNITTEST_H_