Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(674)

Unified Diff: net/url_request/url_request_http_job.cc

Issue 6065008: Do not override User-Agent header added by WebCore (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_request_headers_unittest.cc ('k') | net/url_request/url_request_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/url_request_http_job.cc
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index 21b84f23ee84c7fc85f1444dd9dadb31ef28d099..df0c7f05f0563536d44728cf7e5c2020e2d926b7 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -303,18 +303,12 @@ void URLRequestHttpJob::AddExtraHeaders() {
if (context) {
// Only add default Accept-Language and Accept-Charset if the request
// didn't have them specified.
- if (!request_info_.extra_headers.HasHeader(
- HttpRequestHeaders::kAcceptLanguage)) {
- request_info_.extra_headers.SetHeader(
- HttpRequestHeaders::kAcceptLanguage,
- context->accept_language());
- }
- if (!request_info_.extra_headers.HasHeader(
- HttpRequestHeaders::kAcceptCharset)) {
- request_info_.extra_headers.SetHeader(
- HttpRequestHeaders::kAcceptCharset,
- context->accept_charset());
- }
+ request_info_.extra_headers.SetHeaderIfMissing(
+ HttpRequestHeaders::kAcceptLanguage,
+ context->accept_language());
+ request_info_.extra_headers.SetHeaderIfMissing(
+ HttpRequestHeaders::kAcceptCharset,
+ context->accept_charset());
}
}
@@ -660,7 +654,7 @@ void URLRequestHttpJob::Start() {
request_info_.priority = request_->priority();
if (request_->context()) {
- request_info_.extra_headers.SetHeader(
+ request_info_.extra_headers.SetHeaderIfMissing(
HttpRequestHeaders::kUserAgent,
request_->context()->GetUserAgent(request_->url()));
}
« no previous file with comments | « net/http/http_request_headers_unittest.cc ('k') | net/url_request/url_request_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698