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

Unified Diff: chrome/browser/automation/url_request_automation_job.cc

Issue 10918279: Provide mutable members of UrlRequestContext via pure-virtual interface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add TODO Created 8 years, 2 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 | « no previous file | chrome/browser/io_thread.h » ('j') | chrome/browser/io_thread.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/url_request_automation_job.cc
diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc
index a5c790d09072eae3091a6b509104ee23df2f0a93..74669580c188ec89aae51f2f0f19524bf2514168 100644
--- a/chrome/browser/automation/url_request_automation_job.cc
+++ b/chrome/browser/automation/url_request_automation_job.cc
@@ -422,16 +422,20 @@ void URLRequestAutomationJob::StartAsync() {
// Only add default Accept-Language and Accept-Charset if the request
// didn't have them specified.
if (!new_request_headers.HasHeader(
- net::HttpRequestHeaders::kAcceptLanguage) &&
- !request_->context()->accept_language().empty()) {
- new_request_headers.SetHeader(net::HttpRequestHeaders::kAcceptLanguage,
- request_->context()->accept_language());
+ net::HttpRequestHeaders::kAcceptLanguage)) {
+ std::string accept_language = request_->context()->GetAcceptLanguage();
+ if (!accept_language.empty()) {
+ new_request_headers.SetHeader(net::HttpRequestHeaders::kAcceptLanguage,
+ accept_language);
+ }
}
if (!new_request_headers.HasHeader(
- net::HttpRequestHeaders::kAcceptCharset) &&
- !request_->context()->accept_charset().empty()) {
- new_request_headers.SetHeader(net::HttpRequestHeaders::kAcceptCharset,
- request_->context()->accept_charset());
+ net::HttpRequestHeaders::kAcceptCharset)) {
+ std::string accept_charset = request_->context()->GetAcceptCharset();
+ if (!accept_charset.empty()) {
+ new_request_headers.SetHeader(net::HttpRequestHeaders::kAcceptCharset,
+ accept_charset);
+ }
}
// Ensure that we do not send username and password fields in the referrer.
« no previous file with comments | « no previous file | chrome/browser/io_thread.h » ('j') | chrome/browser/io_thread.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698