Reverting 30551.

net/socket_stream/socket_stream.h

 // Copyright (c) 2009 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_SOCKET_STREAM_SOCKET_STREAM_H_
 #define NET_SOCKET_STREAM_SOCKET_STREAM_H_
 
 #include <deque>
 #include <map>
 #include <string>
@@ skipping 61 matching lines @@
     virtual void OnClose(SocketStream* socket) = 0;
 
     // Called when proxy authentication required.
     // The delegate should call RestartWithAuth() if credential for |auth_info|
     // is found in password database, or call Close() to close the connection.
     virtual void OnAuthRequired(SocketStream* socket,
                                 AuthChallengeInfo* auth_info) {
       // 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);
 
   // The user data allows the clients to associate data with this job.
   // Multiple user data values can be stored under different keys.
   // This job will TAKE OWNERSHIP of the given data pointer, and will
   // delete the object if it is changed or the job is destroyed.
   UserData* GetUserData(const void* key) const;
   void SetUserData(const void* key, UserData* data);
@@ skipping 72 matching lines @@
     STATE_TCP_CONNECT,
     STATE_TCP_CONNECT_COMPLETE,
     STATE_WRITE_TUNNEL_HEADERS,
     STATE_WRITE_TUNNEL_HEADERS_COMPLETE,
     STATE_READ_TUNNEL_HEADERS,
     STATE_READ_TUNNEL_HEADERS_COMPLETE,
     STATE_SOCKS_CONNECT,
     STATE_SOCKS_CONNECT_COMPLETE,
     STATE_SSL_CONNECT,
     STATE_SSL_CONNECT_COMPLETE,
-    STATE_READ_WRITE,
-    STATE_AUTH_REQUIRED,
+    STATE_READ_WRITE
   };
 
   enum ProxyMode {
     kDirectConnection,  // If using a direct connection
     kTunnelProxy,  // If using a tunnel (CONNECT method as HTTPS)
     kSOCKSProxy,  // If using a SOCKS proxy
   };
 
   typedef std::deque< scoped_refptr<IOBufferWithSize> > PendingDataQueue;
   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);
 
   void OnIOCompleted(int result);
   void OnReadCompleted(int result);
   void OnWriteCompleted(int result);
 
-  void DoLoop(int result);
+  int DoLoop(int result);
 
   int DoResolveProxy();
   int DoResolveProxyComplete(int result);
   int DoResolveHost();
   int DoResolveHostComplete(int result);
   int DoTcpConnect();
   int DoTcpConnectComplete(int result);
   int DoWriteTunnelHeaders();
   int DoWriteTunnelHeadersComplete(int result);
   int DoReadTunnelHeaders();
@@ skipping 70 matching lines @@
   int write_buf_offset_;
   int write_buf_size_;
   PendingDataQueue pending_write_bufs_;
 
   DISALLOW_COPY_AND_ASSIGN(SocketStream);
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_STREAM_SOCKET_STREAM_H_