Use base::ObjectWatcher instead of MessageLoop::WatchObject for some consumers in the net module.

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

1 files changed, 5 insertions, 5 deletions

diff --git a/net/base/telnet_server.cc b/net/base/telnet_server.cc
index 75d9361..82506a0 100644
--- a/net/base/telnet_server.cc
+++ b/net/base/telnet_server.cc
@@ -90,8 +90,8 @@ class TelnetProtocol {
 ///////////////////////
 
 // must run in the IO thread
-TelnetServer::TelnetServer(SOCKET s, ListenSocketDelegate* del, MessageLoop *l)
-    : ListenSocket(s, del, l) {
+TelnetServer::TelnetServer(SOCKET s, ListenSocketDelegate* del)
+    : ListenSocket(s, del) {
   input_state_ = NOT_IN_IAC_OR_ESC_SEQUENCE;
 }
 
@@ -133,7 +133,7 @@ void TelnetServer::Accept() {
     // TODO
   } else {
     scoped_refptr<TelnetServer> sock =
-      new TelnetServer(conn, socket_delegate_, loop_);
+        new TelnetServer(conn, socket_delegate_);
 
     // Setup the way we want to communicate
     sock->SendIAC(TelnetProtocol::DO, TelnetProtocol::ECHO);
@@ -148,12 +148,12 @@ void TelnetServer::Accept() {
 }
 
 TelnetServer* TelnetServer::Listen(std::string ip, int port,
-                                   ListenSocketDelegate *del, MessageLoop* l) {
+                                   ListenSocketDelegate *del) {
   SOCKET s = ListenSocket::Listen(ip, port);
   if (s == INVALID_SOCKET) {
     // TODO
   } else {
-    TelnetServer *serv = new TelnetServer(s, del, l);
+    TelnetServer *serv = new TelnetServer(s, del);
     serv->Listen();
     return serv;
   }