Use HttpAuthController in SocketStream

net/socket_stream/socket_stream.h

Index: net/socket_stream/socket_stream.h
diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h
index 5220e4c3ca2da2d8ef6c29dbf1c01b6342859b3b..489cba3aacdac7c49e8a44d3104017c900550d7e 100644
--- a/net/socket_stream/socket_stream.h
+++ b/net/socket_stream/socket_stream.h
@@ -33,6 +33,7 @@ class AuthChallengeInfo;
 class ClientSocketFactory;
 class CookieOptions;
 class HostResolver;
+class HttpAuthController;
 class HttpAuthHandlerFactory;
 class SSLConfigService;
 class SSLInfo;
@@ -230,6 +231,8 @@ class NET_EXPORT SocketStream
     STATE_RESOLVE_PROTOCOL_COMPLETE,
     STATE_TCP_CONNECT,
     STATE_TCP_CONNECT_COMPLETE,
+    STATE_GENERATE_PROXY_AUTH_TOKEN,
+    STATE_GENERATE_PROXY_AUTH_TOKEN_COMPLETE,
     STATE_WRITE_TUNNEL_HEADERS,
     STATE_WRITE_TUNNEL_HEADERS_COMPLETE,
     STATE_READ_TUNNEL_HEADERS,
@@ -288,6 +291,8 @@ class NET_EXPORT SocketStream
   int DoResolveProtocolComplete(int result);
   int DoTcpConnect(int result);
   int DoTcpConnectComplete(int result);
+  int DoGenerateProxyAuthToken();
+  int DoGenerateProxyAuthTokenComplete(int result);
   int DoWriteTunnelHeaders();
   int DoWriteTunnelHeadersComplete(int result);
   int DoReadTunnelHeaders();
@@ -313,6 +318,8 @@ class NET_EXPORT SocketStream
   int HandleCertificateError(int result);
   int AllowCertErrorForReconnection(SSLConfig* ssl_config);
 
+  bool ShouldApplyProxyAuth() const;
+
   SSLConfigService* ssl_config_service() const;
   ProxyService* proxy_service() const;
 
@@ -328,7 +335,6 @@ class NET_EXPORT SocketStream
   HostResolver* host_resolver_;
   CertVerifier* cert_verifier_;
   ServerBoundCertService* server_bound_cert_service_;
-  HttpAuthHandlerFactory* http_auth_handler_factory_;
   ClientSocketFactory* factory_;
 
   ProxyMode proxy_mode_;
@@ -337,10 +343,7 @@ class NET_EXPORT SocketStream
   ProxyService::PacRequest* pac_request_;
   ProxyInfo proxy_info_;
 
-  HttpAuthCache auth_cache_;
-  scoped_ptr<HttpAuthHandler> auth_handler_;
-  HttpAuth::Identity auth_identity_;
-  scoped_refptr<AuthChallengeInfo> auth_info_;
+  scoped_refptr<HttpAuthController> proxy_auth_controller_;
 
   scoped_refptr<RequestHeaders> tunnel_request_headers_;
   size_t tunnel_request_headers_bytes_sent_;