Don't add default Accept-Language and Accept-Charset headers if specific ones were set in URLRequest

net/url_request/url_request_http_job.cc

 // Copyright (c) 2006-2009 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.
 
 #include "net/url_request/url_request_http_job.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
@@ skipping 625 matching lines @@
       // a response.  When done, we'll record histograms via SDCH_DECODE or
       // SDCH_PASSTHROUGH.  Hence we need to record packet arrival times.
       EnablePacketCounting(kSdchPacketHistogramCount);
     }
   }
 
   URLRequestContext* context = request_->context();
   if (context) {
     if (context->AllowSendingCookies(request_))
       request_info_.extra_headers += AssembleRequestCookies();
-    if (!context->accept_language().empty())
-      request_info_.extra_headers += "Accept-Language: " +
+
+    // Only add default Accept-Language and Accept-Charset if the request
+    // didn't have them specifically specified.
+    static const std::string kAcceptLanguage = "Accept-Language";

[eroman, 2009/09/22 01:02:45]

Can you make this a const char* instead?

+    if (!context->accept_language().empty() &&
+        !net::HttpUtil::HasHeader(request_info_.extra_headers, kAcceptLanguage.c_str()))

[eroman, 2009/09/22 01:02:45]

break lines at 80 characters.

+      request_info_.extra_headers += kAcceptLanguage + ": " +
           context->accept_language() + "\r\n";
-    if (!context->accept_charset().empty())
-      request_info_.extra_headers += "Accept-Charset: " +
+
+    static const std::string kAcceptCharset = "Accept-Charset";

[eroman, 2009/09/22 01:02:45]

Please only use static const char*.

+    if (!context->accept_charset().empty() &&
+        !net::HttpUtil::HasHeader(request_info_.extra_headers, kAcceptCharset.c_str()))

[eroman, 2009/09/22 01:02:45]

break lines at 80 characters.

+      request_info_.extra_headers += kAcceptCharset + ": " +

[eroman, 2009/09/22 01:02:45]

Since this is the same as for accept-language, can you extract it to a function?

Perhaps something like:

// If |*headers| already contains |header_name| do nothing. 
// Otherwise add <header_name> ":" <header_value> to the end of the list.
void AppendHeaderIfMissing(const char* header_name, const std::string&
header_value, std::string* headers);

           context->accept_charset() + "\r\n";
   }
 }
 
 std::string URLRequestHttpJob::AssembleRequestCookies() {
   if (request_info_.load_flags & net::LOAD_DO_NOT_SEND_COOKIES)
     return std::string();
 
   URLRequestContext* context = request_->context();
   if (context) {
@@ skipping 43 matching lines @@
 
   std::string name = "Strict-Transport-Security";
   std::string value;
 
   void* iter = NULL;
   while (response_info_->headers->EnumerateHeader(&iter, name, &value)) {
     ctx->strict_transport_security_state()->DidReceiveHeader(
         request_info_.url, value);
   }
 }