Stop sending Accept-Charset HTTP header as its not relevant anymore. Remove it from HttpUserAgentSettings as well as this is no longer needed.

BUG=112804

Review URL: https://chromiumcodereview.appspot.com/12463021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188237 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 15 insertions, 92 deletions

diff --git a/net/url_request/http_user_agent_settings.h b/net/url_request/http_user_agent_settings.h
index 84ae9fb..d475a88 100644
--- a/net/url_request/http_user_agent_settings.h
+++ b/net/url_request/http_user_agent_settings.h
@@ -14,8 +14,8 @@ class GURL;
 
 namespace net {
 
-// The interface used by HTTP jobs to retrieve HTTP Accept-Language,
-// Accept-Charset and User-Agent header values.
+// The interface used by HTTP jobs to retrieve HTTP Accept-Language
+// and User-Agent header values.
 class NET_EXPORT HttpUserAgentSettings {
  public:
   HttpUserAgentSettings() {}
@@ -24,9 +24,6 @@ class NET_EXPORT HttpUserAgentSettings {
   // Gets the value of 'Accept-Language' header field.
   virtual std::string GetAcceptLanguage() const = 0;
 
-  // Gets the value of 'Accept-Charset' header field.
-  virtual std::string GetAcceptCharset() const = 0;
-
   // Gets the UA string to use for the given URL.  Pass an empty URL to get
   // the default UA string.
   virtual std::string GetUserAgent(const GURL& url) const = 0;
diff --git a/net/url_request/static_http_user_agent_settings.cc b/net/url_request/static_http_user_agent_settings.cc
index 475aa8f..1fd1992 100644
--- a/net/url_request/static_http_user_agent_settings.cc
+++ b/net/url_request/static_http_user_agent_settings.cc
@@ -8,10 +8,8 @@ namespace net {
 
 StaticHttpUserAgentSettings::StaticHttpUserAgentSettings(
     const std::string& accept_language,
-    const std::string& accept_charset,
     const std::string& user_agent)
     : accept_language_(accept_language),
-      accept_charset_(accept_charset),
       user_agent_(user_agent) {
 }
 
@@ -22,10 +20,6 @@ std::string StaticHttpUserAgentSettings::GetAcceptLanguage() const {
   return accept_language_;
 }
 
-std::string StaticHttpUserAgentSettings::GetAcceptCharset() const {
-  return accept_charset_;
-}
-
 std::string StaticHttpUserAgentSettings::GetUserAgent(const GURL& url) const {
   return user_agent_;
 }
diff --git a/net/url_request/static_http_user_agent_settings.h b/net/url_request/static_http_user_agent_settings.h
index 09cabd3..8819daa 100644
--- a/net/url_request/static_http_user_agent_settings.h
+++ b/net/url_request/static_http_user_agent_settings.h
@@ -15,23 +15,19 @@
 namespace net {
 
 // An implementation of |HttpUserAgentSettings| that always provides the
-// same constant values for the HTTP Accept-Language, Accept-Charset, and
-// User-Agent headers.
+// same constant values for the HTTP Accept-Language and User-Agent headers.
 class NET_EXPORT StaticHttpUserAgentSettings : public HttpUserAgentSettings {
  public:
   StaticHttpUserAgentSettings(const std::string& accept_language,
-                              const std::string& accept_charset,
                               const std::string& user_agent);
   virtual ~StaticHttpUserAgentSettings();
 
   // HttpUserAgentSettings implementation
   virtual std::string GetAcceptLanguage() const OVERRIDE;
-  virtual std::string GetAcceptCharset() const OVERRIDE;
   virtual std::string GetUserAgent(const GURL& url) const OVERRIDE;
 
  private:
   const std::string accept_language_;
-  const std::string accept_charset_;
   const std::string user_agent_;
 
   DISALLOW_COPY_AND_ASSIGN(StaticHttpUserAgentSettings);
diff --git a/net/url_request/url_request_context.cc b/net/url_request/url_request_context.cc
index 94d7f22..e88750b 100644
--- a/net/url_request/url_request_context.cc
+++ b/net/url_request/url_request_context.cc
@@ -85,11 +85,6 @@ void URLRequestContext::set_cookie_store(CookieStore* cookie_store) {
   cookie_store_ = cookie_store;
 }
 
-std::string URLRequestContext::GetAcceptCharset() const {
-  return http_user_agent_settings_ ?
-      http_user_agent_settings_->GetAcceptCharset() : EmptyString();
-}
-
 std::string URLRequestContext::GetAcceptLanguage() const {
   return http_user_agent_settings_ ?
       http_user_agent_settings_->GetAcceptLanguage() : EmptyString();
diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index 1476d87..f5dc635 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -178,8 +178,6 @@ class NET_EXPORT URLRequestContext
   // Legacy accessors that delegate to http_user_agent_settings_.
   // TODO(pauljensen): Remove after all clients are updated to directly access
   // http_user_agent_settings_.
-  // Gets the value of 'Accept-Charset' header field.
-  std::string GetAcceptCharset() const;
   // Gets the value of 'Accept-Language' header field.
   std::string GetAcceptLanguage() const;
   // Gets the UA string to use for the given URL.  Pass an invalid URL (such as
@@ -209,7 +207,7 @@ class NET_EXPORT URLRequestContext
   void AssertNoURLRequests() const;
 
   // Get the underlying |HttpUserAgentSettings| implementation that provides
-  // the HTTP Accept-Language, Accept-Charset and User-Agent header values.
+  // the HTTP Accept-Language and User-Agent header values.
   const HttpUserAgentSettings* http_user_agent_settings() const {
     return http_user_agent_settings_;
   }
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
index c82729f..498e0ca 100644
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -196,7 +196,7 @@ URLRequestContext* URLRequestContextBuilder::Build() {
   URLRequestContextStorage* storage = context->storage();
 
   storage->set_http_user_agent_settings(new StaticHttpUserAgentSettings(
-      accept_language_, accept_charset_, user_agent_));
+      accept_language_, user_agent_));
 
   if (!network_delegate_)
     network_delegate_.reset(new BasicNetworkDelegate);
diff --git a/net/url_request/url_request_context_builder.h b/net/url_request/url_request_context_builder.h
index b11ccfa..2163ed5 100644
--- a/net/url_request/url_request_context_builder.h
+++ b/net/url_request/url_request_context_builder.h
@@ -72,15 +72,12 @@ class NET_EXPORT URLRequestContextBuilder {
   void set_proxy_config_service(ProxyConfigService* proxy_config_service);
 #endif  // defined(OS_LINUX) || defined(OS_ANDROID)
 
-  // Call these functions to specify hard-coded Accept-Language,
-  // Accept-Charset, or User-Agent header values for all requests that don't
+  // Call these functions to specify hard-coded Accept-Language
+  // or User-Agent header values for all requests that don't
   // have the headers already set.
   void set_accept_language(const std::string& accept_language) {
     accept_language_ = accept_language;
   }
-  void set_accept_charset(const std::string& accept_charset) {
-    accept_charset_ = accept_charset;
-  }
   void set_user_agent(const std::string& user_agent) {
     user_agent_ = user_agent;
   }
@@ -116,7 +113,6 @@ class NET_EXPORT URLRequestContextBuilder {
 
  private:
   std::string accept_language_;
-  std::string accept_charset_;
   std::string user_agent_;
   bool ftp_enabled_;
   bool http_cache_enabled_;
diff --git a/net/url_request/url_request_ftp_job_unittest.cc b/net/url_request/url_request_ftp_job_unittest.cc
index 7647b3f..61dde753 100644
--- a/net/url_request/url_request_ftp_job_unittest.cc
+++ b/net/url_request/url_request_ftp_job_unittest.cc
@@ -307,8 +307,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestDoNotReuseSocket) {
               "Connection: keep-alive\r\n"
               "User-Agent:\r\n"
               "Accept-Encoding: gzip,deflate\r\n"
-              "Accept-Language: en-us,fr\r\n"
-              "Accept-Charset: iso-8859-1,*,utf-8\r\n\r\n"),
+              "Accept-Language: en-us,fr\r\n\r\n"),
   };
   MockRead reads1[] = {
     MockRead(ASYNC, 1, "HTTP/1.1 200 OK\r\n"),
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index ba4f109..716fe4c 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -484,8 +484,8 @@ void URLRequestHttpJob::AddExtraHeaders() {
   }
 
   if (http_user_agent_settings_) {
-    // Only add default Accept-Language and Accept-Charset if the request
-    // didn't have them specified.
+    // Only add default Accept-Language if the request didn't have it
+    // specified.
     std::string accept_language =
         http_user_agent_settings_->GetAcceptLanguage();
     if (!accept_language.empty()) {
@@ -493,12 +493,6 @@ void URLRequestHttpJob::AddExtraHeaders() {
           HttpRequestHeaders::kAcceptLanguage,
           accept_language);
     }
-    std::string accept_charset = http_user_agent_settings_->GetAcceptCharset();
-    if (!accept_charset.empty()) {
-      request_info_.extra_headers.SetHeaderIfMissing(
-          HttpRequestHeaders::kAcceptCharset,
-          accept_charset);
-    }
   }
 }
 
diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc
index dd01308..e5c0051 100644
--- a/net/url_request/url_request_test_util.cc
+++ b/net/url_request/url_request_test_util.cc
@@ -124,8 +124,7 @@ void TestURLRequestContext::Init() {
   }
   if (!http_user_agent_settings()) {
     context_storage_.set_http_user_agent_settings(
-        new StaticHttpUserAgentSettings(
-            "en-us,fr", "iso-8859-1,*,utf-8", EmptyString()));
+        new StaticHttpUserAgentSettings("en-us,fr", EmptyString()));
   }
   if (!job_factory())
     context_storage_.set_job_factory(new URLRequestJobFactoryImpl);
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index c1de731..269e86c 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -3919,7 +3919,7 @@ TEST_F(URLRequestTestHTTP, InterceptPost307RedirectPost) {
 TEST_F(URLRequestTestHTTP, DefaultAcceptLanguage) {
   ASSERT_TRUE(test_server_.Start());
 
-  StaticHttpUserAgentSettings settings("en", EmptyString(), EmptyString());
+  StaticHttpUserAgentSettings settings("en", EmptyString());
   TestNetworkDelegate network_delegate;  // Must outlive URLRequests.
   TestURLRequestContext context(true);
   context.set_network_delegate(&network_delegate);
@@ -3938,8 +3938,7 @@ TEST_F(URLRequestTestHTTP, DefaultAcceptLanguage) {
 TEST_F(URLRequestTestHTTP, EmptyAcceptLanguage) {
   ASSERT_TRUE(test_server_.Start());
 
-  StaticHttpUserAgentSettings settings(
-      EmptyString(), EmptyString(), EmptyString());
+  StaticHttpUserAgentSettings settings(EmptyString(), EmptyString());
   TestNetworkDelegate network_delegate;  // Must outlive URLRequests.
   TestURLRequestContext context(true);
   context.set_network_delegate(&network_delegate);
@@ -4006,52 +4005,8 @@ TEST_F(URLRequestTestHTTP, OverrideAcceptEncoding) {
   EXPECT_TRUE(ContainsString(d.data_received(), "identity"));
 }
 
-// Check that default A-C header is sent.
-TEST_F(URLRequestTestHTTP, DefaultAcceptCharset) {
-  ASSERT_TRUE(test_server_.Start());
-
-  StaticHttpUserAgentSettings settings(EmptyString(), "en", EmptyString());
-  TestNetworkDelegate network_delegate;  // Must outlive URLRequests.
-  TestURLRequestContext context(true);
-  context.set_network_delegate(&network_delegate);
-  context.set_http_user_agent_settings(&settings);
-  context.Init();
-
-  TestDelegate d;
-  URLRequest req(test_server_.GetURL("echoheader?Accept-Charset"),
-                 &d,
-                 &context);
-  req.Start();
-  MessageLoop::current()->Run();
-  EXPECT_EQ("en", d.data_received());
-}
-
-// Check that an empty A-C header is not sent. http://crbug.com/77365.
-TEST_F(URLRequestTestHTTP, EmptyAcceptCharset) {
-  ASSERT_TRUE(test_server_.Start());
-
-  StaticHttpUserAgentSettings settings(
-      EmptyString(), EmptyString(), EmptyString());
-  TestNetworkDelegate network_delegate;  // Must outlive URLRequests.
-  TestURLRequestContext context(true);
-  context.set_network_delegate(&network_delegate);
-  context.Init();
-  // We override the accepted charset after initialization because empty
-  // entries get overridden otherwise.
-  context.set_http_user_agent_settings(&settings);
-
-  TestDelegate d;
-  URLRequest req(test_server_.GetURL("echoheader?Accept-Charset"),
-                 &d,
-                 &context);
-  req.Start();
-  MessageLoop::current()->Run();
-  EXPECT_EQ("None", 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) {
+// Check that setting the A-C header sends the proper header.
+TEST_F(URLRequestTestHTTP, SetAcceptCharset) {
   ASSERT_TRUE(test_server_.Start());
 
   TestDelegate d;