Reverting 30551.

net/socket_stream/socket_stream.h

Index: net/socket_stream/socket_stream.h
===================================================================
--- net/socket_stream/socket_stream.h	(revision 30551)
+++ net/socket_stream/socket_stream.h	(working copy)
@@ -79,11 +79,6 @@
       // By default, no credential is available and close the connection.
       socket->Close();
     }
-
-    // Called when an error occured.
-    // This is only for error reporting to the delegate.
-    // |error| is net::Error.
-    virtual void OnError(const SocketStream* socket, int error) {}
   };
 
   SocketStream(const GURL& url, Delegate* delegate);
@@ -176,8 +171,7 @@
     STATE_SOCKS_CONNECT_COMPLETE,
     STATE_SSL_CONNECT,
     STATE_SSL_CONNECT_COMPLETE,
-    STATE_READ_WRITE,
-    STATE_AUTH_REQUIRED,
+    STATE_READ_WRITE
   };
 
   enum ProxyMode {
@@ -190,12 +184,11 @@
   friend class base::RefCountedThreadSafe<SocketStream>;
   ~SocketStream();
 
-  // Finishes the job.
-  // Calls OnError and OnClose of delegate, and no more
+  // Finish the job.  Once finished, calls OnClose of delegate, and no more
   // notifications will be sent to delegate.
-  void Finish(int result);
+  void Finish();
 
-  int DidEstablishConnection();
+  void DidEstablishConnection();
   void DidReceiveData(int result);
   void DidSendData(int result);
 
@@ -203,7 +196,7 @@
   void OnReadCompleted(int result);
   void OnWriteCompleted(int result);
 
-  void DoLoop(int result);
+  int DoLoop(int result);
 
   int DoResolveProxy();
   int DoResolveProxyComplete(int result);