Don't add default Accept-Language and Accept-Charset headers if specific ones...

net/url_request/url_request_unittest.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_unittest.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ skipping 44 matching lines @@
     proxy_service_ = net::ProxyService::CreateNull();
     ftp_transaction_factory_ = new net::FtpNetworkLayer(host_resolver_);
     ssl_config_service_ = new net::SSLConfigServiceDefaults;
     http_transaction_factory_ =
         new net::HttpCache(
           net::HttpNetworkLayer::CreateFactory(host_resolver_, proxy_service_,
                                                ssl_config_service_),
           disk_cache::CreateInMemoryCacheBackend(0));
     // In-memory cookie store.
     cookie_store_ = new net::CookieMonster();
+    accept_language_ = "en-us,fr";
+    accept_charset_ = "iso-8859-1,*,utf-8";
   }
 
   virtual ~URLRequestTestContext() {
     delete ftp_transaction_factory_;
     delete http_transaction_factory_;
   }
 };
 
 class TestURLRequest : public URLRequest {
  public:
@@ skipping 2137 matching lines @@
 
     int64 file_size = 0;
     file_util::GetFileSize(app_path, &file_size);
 
     EXPECT_FALSE(r.is_pending());
     EXPECT_EQ(1, d->response_started_count());
     EXPECT_FALSE(d->received_data_before_response());
     EXPECT_EQ(d->bytes_received(), static_cast<int>(file_size));
   }
 }
+
+// Check that default A-L header is sent.
+TEST_F(URLRequestTestHTTP, DefaultAcceptLanguage) {
+  ASSERT_TRUE(NULL != server_.get());
+  TestDelegate d;
+  TestURLRequest req(server_->TestServerPage("echoheader?Accept-Language"), &d);
+  req.set_context(new URLRequestTestContext());
+  req.Start();
+  MessageLoop::current()->Run();
+  EXPECT_EQ(req.context()->accept_language(), d.data_received());
+}
+
+// Check that if request overrides the A-L header, the default is not appended.
+// See http://crbug.com/20894
+TEST_F(URLRequestTestHTTP, OverrideAcceptLanguage) {
+  ASSERT_TRUE(NULL != server_.get());
+  TestDelegate d;
+  TestURLRequest req(server_->TestServerPage("echoheader?Accept-Language"), &d);
+  req.set_context(new URLRequestTestContext());
+  req.SetExtraRequestHeaders("Accept-Language: ru");
+  req.Start();
+  MessageLoop::current()->Run();
+  EXPECT_EQ(std::string("ru"), d.data_received());
+}
+
+// Check that default A-C header is sent.
+TEST_F(URLRequestTestHTTP, DefaultAcceptCharset) {
+  ASSERT_TRUE(NULL != server_.get());
+  TestDelegate d;
+  TestURLRequest req(server_->TestServerPage("echoheader?Accept-Charset"), &d);
+  req.set_context(new URLRequestTestContext());
+  req.Start();
+  MessageLoop::current()->Run();
+  EXPECT_EQ(req.context()->accept_charset(), d.data_received());
+}
+
+// Check that if request overrides the A-C header, the default is not appended.
+// See http://crbug.com/20894
+TEST_F(URLRequestTestHTTP, OverrideAcceptCharset) {
+  ASSERT_TRUE(NULL != server_.get());
+  TestDelegate d;
+  TestURLRequest req(server_->TestServerPage("echoheader?Accept-Charset"), &d);
+  req.set_context(new URLRequestTestContext());
+  req.SetExtraRequestHeaders("Accept-Charset: koi-8r");
+  req.Start();
+  MessageLoop::current()->Run();
+  EXPECT_EQ(std::string("koi-8r"), d.data_received());
+}
+