Remove the net_log member from HttpAuthController.

net/http/http_proxy_client_socket.cc

 // Copyright (c) 2010 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.
 
 #include "net/http/http_proxy_client_socket.h"
 
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/io_buffer.h"
@@ skipping 39 matching lines @@
 
 HttpProxyClientSocket::HttpProxyClientSocket(
     ClientSocketHandle* transport_socket, const GURL& request_url,
     const HostPortPair& endpoint, const scoped_refptr<HttpAuthController>& auth,
     bool tunnel)
     : ALLOW_THIS_IN_INITIALIZER_LIST(
           io_callback_(this, &HttpProxyClientSocket::OnIOComplete)),
       next_state_(STATE_NONE),
       user_callback_(NULL),
       transport_(transport_socket),
+      endpoint_(endpoint),
+      auth_(auth),
       tunnel_(tunnel),
-      auth_(auth),
-      endpoint_(endpoint),
       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";
 }
 
 HttpProxyClientSocket::~HttpProxyClientSocket() {
   Disconnect();
 }
 
 int HttpProxyClientSocket::Connect(CompletionCallback* callback) {
@@ skipping 202 matching lines @@
         rv = ERR_UNEXPECTED;
         break;
     }
   } while (rv != ERR_IO_PENDING && next_state_ != STATE_NONE
            && next_state_ != STATE_DONE);
   return rv;
 }
 
 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) {
   DCHECK_NE(ERR_IO_PENDING, result);
   if (result == OK)
     next_state_ = STATE_SEND_REQUEST;
   return result;
 }
 
 int HttpProxyClientSocket::DoSendRequest() {
@@ skipping 104 matching lines @@
     return DidDrainBodyForAuthRestart(true);
 
   // Keep draining.
   next_state_ = STATE_DRAIN_BODY;
   return OK;
 }
 
 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;
 
   return rv;
 }
 
 }  // namespace net