diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-13 20:45:31 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-13 20:45:31 +0000 |
| commit | 560c0431ae36b3c115aad89a014a5fcbb296f420 (patch) | |
| tree | cc0ca213d15e01e8278988e9ace989624c8babdb /net/http/http_proxy_client_socket.cc | |
| parent | 64bff312f36572a45a331aab9d6e82e7c03a5d6d (diff) | |
| download | chromium_src-560c0431ae36b3c115aad89a014a5fcbb296f420.zip chromium_src-560c0431ae36b3c115aad89a014a5fcbb296f420.tar.gz chromium_src-560c0431ae36b3c115aad89a014a5fcbb296f420.tar.bz2 | |
Remove |net_log_| as a class member and pass it in where needed and a little cleanup.
BUG=42795
TEST=existing unit tests
Review URL: http://codereview.chromium.org/2806052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52214 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_proxy_client_socket.cc')
| -rw-r--r-- | net/http/http_proxy_client_socket.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/http/http_proxy_client_socket.cc b/net/http/http_proxy_client_socket.cc index 321b5ea..df64589 100644 --- a/net/http/http_proxy_client_socket.cc +++ b/net/http/http_proxy_client_socket.cc @@ -57,13 +57,11 @@ HttpProxyClientSocket::HttpProxyClientSocket( next_state_(STATE_NONE), user_callback_(NULL), transport_(transport_socket), - tunnel_(tunnel), - auth_(auth), endpoint_(endpoint), + auth_(auth), + tunnel_(tunnel), net_log_(transport_socket->socket()->NetLog()) { DCHECK_EQ(tunnel, auth != NULL); - if (tunnel) - auth->set_net_log(net_log_); // Synthesize the bits of a request that we actually use. request_.url = request_url; request_.method = "GET"; @@ -286,7 +284,7 @@ int HttpProxyClientSocket::DoLoop(int last_io_result) { int HttpProxyClientSocket::DoGenerateAuthToken() { next_state_ = STATE_GENERATE_AUTH_TOKEN_COMPLETE; - return auth_->MaybeGenerateAuthToken(&request_, &io_callback_); + return auth_->MaybeGenerateAuthToken(&request_, &io_callback_, net_log_); } int HttpProxyClientSocket::DoGenerateAuthTokenComplete(int result) { @@ -411,7 +409,7 @@ int HttpProxyClientSocket::DoDrainBodyComplete(int result) { int HttpProxyClientSocket::HandleAuthChallenge() { DCHECK(response_.headers); - int rv = auth_->HandleAuthChallenge(response_.headers, false, true); + int rv = auth_->HandleAuthChallenge(response_.headers, false, true, net_log_); response_.auth_challenge = auth_->auth_info(); if (rv == OK) return ERR_PROXY_AUTH_REQUESTED; |