| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/http/http_proxy_utils.h" | 5 #include "net/http/http_proxy_utils.h" |
| 6 | 6 |
| 7 #include "base/string_util.h" | 7 #include "base/stringprintf.h" |
| 8 #include "googleurl/src/gurl.h" | 8 #include "googleurl/src/gurl.h" |
| 9 #include "net/base/host_port_pair.h" | 9 #include "net/base/host_port_pair.h" |
| 10 #include "net/base/net_util.h" | 10 #include "net/base/net_util.h" |
| 11 #include "net/http/http_request_info.h" | 11 #include "net/http/http_request_info.h" |
| 12 | 12 |
| 13 namespace net { | 13 namespace net { |
| 14 | 14 |
| 15 void BuildTunnelRequest( | 15 void BuildTunnelRequest( |
| 16 const HttpRequestInfo& request_info, | 16 const HttpRequestInfo& request_info, |
| 17 const HttpRequestHeaders& auth_headers, | 17 const HttpRequestHeaders& auth_headers, |
| (...skipping 12 matching lines...) Expand all Loading... |
| 30 | 30 |
| 31 std::string user_agent; | 31 std::string user_agent; |
| 32 if (request_info.extra_headers.GetHeader(HttpRequestHeaders::kUserAgent, | 32 if (request_info.extra_headers.GetHeader(HttpRequestHeaders::kUserAgent, |
| 33 &user_agent)) | 33 &user_agent)) |
| 34 request_headers->SetHeader(HttpRequestHeaders::kUserAgent, user_agent); | 34 request_headers->SetHeader(HttpRequestHeaders::kUserAgent, user_agent); |
| 35 | 35 |
| 36 request_headers->MergeFrom(auth_headers); | 36 request_headers->MergeFrom(auth_headers); |
| 37 } | 37 } |
| 38 | 38 |
| 39 } // namespace net | 39 } // namespace net |
| OLD | NEW |