Refactor HttpNetworkTransaction to remove side effects in some member functions.

net/http/http_network_transaction.h

 // Copyright (c) 2006-2008 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_HTTP_HTTP_NETWORK_TRANSACTION_H_
 #define NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
 
 #include <string>
 
 #include "base/ref_counted.h"
@@ skipping 37 matching lines @@
   }
 
   virtual int Read(IOBuffer* buf, int buf_len, CompletionCallback* callback);
   virtual const HttpResponseInfo* GetResponseInfo() const;
   virtual LoadState GetLoadState() const;
   virtual uint64 GetUploadProgress() const;
 
  private:
   FRIEND_TEST(HttpNetworkTransactionTest, ResetStateForRestart);
 
-  void BuildRequestHeaders();
-  void BuildTunnelRequest();
   void DoCallback(int result);
   void OnIOComplete(int result);
 
   // Runs the state transition loop.
   int DoLoop(int result);
 
   // Each of these methods corresponds to a State value.  Those with an input
   // argument receive the result from the previous state.  If a method returns
   // ERR_IO_PENDING, then the result from OnIOComplete will be passed to the
   // next state method as the result arg.
@@ skipping 42 matching lines @@
   // Called to possibly recover from an SSL handshake error.  Sets next_state_
   // and returns OK if recovering from the error.  Otherwise, the same error
   // code is returned.
   int HandleSSLHandshakeError(int error);
 
   // Called to possibly recover from the given error.  Sets next_state_ and
   // returns OK if recovering from the error.  Otherwise, the same error code
   // is returned.
   int HandleIOError(int error);
 
-  // Called when we reached EOF or got an error.  If we should resend the
-  // request, sets next_state_ and returns true.  Otherwise, does nothing and
-  // returns false.
-  bool ShouldResendRequest();
+  // Called when we reached EOF or got an error.  Returns true if we should
+  // resend the request.
+  bool ShouldResendRequest() const;
+
+  // Resets the connection and the request headers for resend.  Called when
+  // ShouldResendRequest() is true.
+  void ResetConnectionAndRequestForResend();
 
   // Called when we encounter a network error that could be resolved by trying
   // a new proxy configuration.  If there is another proxy configuration to try
   // then this method sets next_state_ appropriately and returns either OK or
   // ERR_IO_PENDING depending on whether or not the new proxy configuration is
   // available synchronously or asynchronously.  Otherwise, the given error
   // code is simply returned.
   int ReconsiderProxyAfterError(int error);
 
   // Decides the policy when the connection is closed before the end of headers
@@ skipping 12 matching lines @@
   void PrepareForAuthRestart(HttpAuth::Target target);
 
   // Called when we don't need to drain the response body or have drained it.
   // Resets |connection_| unless |keep_alive| is true, then calls
   // ResetStateForRestart.  Sets |next_state_| appropriately.
   void DidDrainBodyForAuthRestart(bool keep_alive);
 
   // Resets the members of the transaction so it can be restarted.
   void ResetStateForRestart();
 
-  // Attach any credentials needed for the proxy server or origin server.
-  void ApplyAuth();
+  // Returns true if we should try to add a Proxy-Authorization header
+  bool ShouldApplyProxyAuth() const;
 
-  // Helper used by ApplyAuth(). Adds either the proxy auth header, or the
-  // origin server auth header, as specified by |target|
-  void AddAuthorizationHeader(HttpAuth::Target target);
+  // Returns true if we should try to add an Authorization header.
+  bool ShouldApplyServerAuth() const;
+
+  // Builds either the proxy auth header, or the origin server auth header,
+  // as specified by |target|.
+  std::string BuildAuthorizationHeader(HttpAuth::Target target) const;
 
   // Returns a log message for all the response headers related to the auth
   // challenge.
   std::string AuthChallengeLogMessage() const;
 
   // Handles HTTP status code 401 or 407.
   // HandleAuthChallenge() returns a network error code, or OK on success.
   // May update |pending_auth_target_| or |response_.auth_challenge|.
   int HandleAuthChallenge();
 
@@ skipping 171 matching lines @@
     STATE_DRAIN_BODY_FOR_AUTH_RESTART,
     STATE_DRAIN_BODY_FOR_AUTH_RESTART_COMPLETE,
     STATE_NONE
   };
   State next_state_;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_NETWORK_TRANSACTION_H_