Reland r42300: "HttpRequestHeaders refactor.""

net/http/http_network_transaction.h

 // 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.
 
 #ifndef NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
 #define NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 15 matching lines @@
 #include "net/proxy/proxy_service.h"
 #include "net/socket/client_socket_pool.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 namespace net {
 
 class ClientSocketFactory;
 class ClientSocketHandle;
 class SpdyStream;
 class HttpNetworkSession;
+class HttpRequestHeaders;
 class HttpStream;
 
 class HttpNetworkTransaction : public HttpTransaction {
  public:
   explicit HttpNetworkTransaction(HttpNetworkSession* session);
 
   virtual ~HttpNetworkTransaction();
 
   // Sets the next protocol negotiation value used during the SSL handshake.
   static void SetNextProtos(const std::string& next_protos);
@@ skipping 161 matching lines @@
 
   // Resets the members of the transaction so it can be restarted.
   void ResetStateForRestart();
 
   // Returns true if we should try to add a Proxy-Authorization header
   bool ShouldApplyProxyAuth() const;
 
   // 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,
+  // Adds either the proxy auth header, or the origin server auth header,
   // as specified by |target|.
-  std::string BuildAuthorizationHeader(HttpAuth::Target target) const;
+  void AddAuthorizationHeader(
+      HttpAuth::Target target, HttpRequestHeaders* authorization_headers) 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 124 matching lines @@
   // The time the DoSSLConnect() method was called (if it got called).
   base::TimeTicks ssl_connect_start_time_;
 
   // The next state in the state machine.
   State next_state_;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_NETWORK_TRANSACTION_H_