summaryrefslogtreecommitdiffstats
path: root/net/url_request/url_request_http_job.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-09 20:10:41 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-09 20:10:41 +0000
commit69078b8d2c607abde0fdedb08930598438e25f5f (patch)
tree16369fd439f1630837aa767cc4ce5ceb8f31f233 /net/url_request/url_request_http_job.cc
parent8a820c8276581a82f263c7e3603ab4bc73a221db (diff)
downloadchromium_src-69078b8d2c607abde0fdedb08930598438e25f5f.zip
chromium_src-69078b8d2c607abde0fdedb08930598438e25f5f.tar.gz
chromium_src-69078b8d2c607abde0fdedb08930598438e25f5f.tar.bz2
Revert 255858 "Simplify the user agent code some more since afte..."
There are some browser_tests failures on the buildbots that don't reproduce locally. Reverting while I investigate. > Simplify the user agent code some more since after r255534 it's not affected by the site's URL. > > Code in content always gets it now from ContentClient::GetUserAgent. In Chrome, there's a GetUserAgent function which returns it. > > BUG=338338 > R=isherman@chromium.org, pauljensen@chromium.org, scottmg@chromium.org, tfarina@chromium.org > > Review URL: https://codereview.chromium.org/191093002 TBR=jam@chromium.org Review URL: https://codereview.chromium.org/192283002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255867 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/url_request_http_job.cc')
-rw-r--r--net/url_request/url_request_http_job.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index 3bedc3d..947686c 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -270,7 +270,8 @@ void URLRequestHttpJob::Start() {
request_info_.extra_headers.SetHeaderIfMissing(
HttpRequestHeaders::kUserAgent,
http_user_agent_settings_ ?
- http_user_agent_settings_->GetUserAgent() : std::string());
+ http_user_agent_settings_->GetUserAgent(request_->url()) :
+ std::string());
AddExtraHeaders();
AddCookieHeaderAndStart();