Moved listen_socket_unittest.{h,cc} to the net namespace. Fixed nits related to this.

BUG=87032
TEST=None

Review URL: http://codereview.chromium.org/7244020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90300 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 22 insertions, 18 deletions

diff --git a/net/base/listen_socket_unittest.cc b/net/base/listen_socket_unittest.cc
index 97a8cf5..f824f22 100644
--- a/net/base/listen_socket_unittest.cc
+++ b/net/base/listen_socket_unittest.cc
@@ -11,6 +11,8 @@
 #include "net/base/net_util.h"
 #include "testing/platform_test.h"
 
+namespace net {
+
 const int ListenSocketTester::kTestPort = 9999;
 
 static const int kReadBufSize = 1024;
@@ -186,31 +188,30 @@ bool ListenSocketTester::Send(SOCKET sock, const std::string& str) {
   return true;
 }
 
-void ListenSocketTester::DidAccept(net::ListenSocket *server,
-                                   net::ListenSocket *connection) {
+void ListenSocketTester::DidAccept(ListenSocket *server,
+                                   ListenSocket *connection) {
   connection_ = connection;
   connection_->AddRef();
   ReportAction(ListenSocketTestAction(ACTION_ACCEPT));
 }
 
-void ListenSocketTester::DidRead(net::ListenSocket *connection,
+void ListenSocketTester::DidRead(ListenSocket *connection,
                                  const char* data,
                                  int len) {
   std::string str(data, len);
   ReportAction(ListenSocketTestAction(ACTION_READ, str));
 }
 
-void ListenSocketTester::DidClose(net::ListenSocket *sock) {
+void ListenSocketTester::DidClose(ListenSocket *sock) {
   ReportAction(ListenSocketTestAction(ACTION_CLOSE));
 }
 
 ListenSocketTester::~ListenSocketTester() {}
 
-net::ListenSocket* ListenSocketTester::DoListen() {
-  return net::ListenSocket::Listen(kLoopback, kTestPort, this);
+ListenSocket* ListenSocketTester::DoListen() {
+  return ListenSocket::Listen(kLoopback, kTestPort, this);
 }
 
-
 class ListenSocketTest: public PlatformTest {
  public:
   ListenSocketTest() {
@@ -243,3 +244,5 @@ TEST_F(ListenSocketTest, ClientSendLong) {
 TEST_F(ListenSocketTest, ServerSend) {
   tester_->TestServerSend();
 }
+
+}  // namespace net
diff --git a/net/base/listen_socket_unittest.h b/net/base/listen_socket_unittest.h
index ed74b88..34286a4 100644
--- a/net/base/listen_socket_unittest.h
+++ b/net/base/listen_socket_unittest.h
@@ -35,6 +35,8 @@ const int INVALID_SOCKET = -1;
 const int SOCKET_ERROR = -1;
 #endif
 
+namespace net {
+
 enum ActionType {
   ACTION_NONE = 0,
   ACTION_LISTEN = 1,
@@ -65,7 +67,7 @@ class ListenSocketTestAction {
 // This had to be split out into a separate class because I couldn't
 // make the testing::Test class refcounted.
 class ListenSocketTester :
-    public net::ListenSocket::ListenSocketDelegate,
+    public ListenSocket::ListenSocketDelegate,
     public base::RefCountedThreadSafe<ListenSocketTester> {
 
  public:
@@ -92,18 +94,15 @@ class ListenSocketTester :
 
   virtual bool Send(SOCKET sock, const std::string& str);
 
-  // net::ListenSocket::ListenSocketDelegate:
-  virtual void DidAccept(net::ListenSocket *server,
-                         net::ListenSocket *connection);
-  virtual void DidRead(net::ListenSocket *connection,
-                       const char* data,
-                       int len);
-  virtual void DidClose(net::ListenSocket *sock);
+  // 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_;
-  net::ListenSocket* server_;
-  net::ListenSocket* connection_;
+  ListenSocket* server_;
+  ListenSocket* connection_;
   ListenSocketTestAction last_action_;
 
   SOCKET test_socket_;
@@ -118,7 +117,9 @@ class ListenSocketTester :
 
   virtual ~ListenSocketTester();
 
-  virtual net::ListenSocket* DoListen();
+  virtual ListenSocket* DoListen();
 };
 
+}  // namespace net
+
 #endif  // NET_BASE_LISTEN_SOCKET_UNITTEST_H_