Add q-values to languages in Accept-Language HTTP header to be compatible wit...

chrome/browser/net/chrome_url_request_context.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/net/chrome_url_request_context.h"
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "net/http/http_cache.h"
+#include "net/http/http_util.h"
 #include "net/proxy/proxy_service.h"
 #include "webkit/glue/webkit_glue.h"
 
 // Sets up proxy info if it was specified, otherwise returns NULL. The
 // returned pointer MUST be deleted by the caller if non-NULL.
 static net::ProxyInfo* CreateProxyInfo() {
   net::ProxyInfo* proxy_info = NULL;
 
   CommandLine command_line;
   if (command_line.HasSwitch(switches::kProxyServer)) {
@@ skipping 60 matching lines @@
   context->cookie_store_ = new net::CookieMonster;
 
   return context;
 }
 
 ChromeURLRequestContext::ChromeURLRequestContext(Profile* profile)
     : prefs_(profile->GetPrefs()),
       is_off_the_record_(profile->IsOffTheRecord()) {
   user_agent_ = webkit_glue::GetUserAgent();
 
-  // set up Accept-Language and Accept-Charset header values
-  // TODO(jungshik) : This may slow down http requests. Perhaps,
-  // we have to come up with a better way to set up these values.
-  accept_language_ = WideToASCII(prefs_->GetString(prefs::kAcceptLanguages));
-  accept_charset_ = WideToASCII(prefs_->GetString(prefs::kDefaultCharset));
-  accept_charset_ += ",*,utf-8";

[wtc, 2009/01/14 02:21:48]

In the old code, we put * before utf-8.  In
the new code, we put utf-8 before *.  Does the
order matter?

+  // Set up Accept-Language and Accept-Charset header values
+  accept_language_ = net::HttpUtil::GenerateAcceptLanguageHeader(
+      WideToASCII(prefs_->GetString(prefs::kAcceptLanguages)));
+  accept_charset_ = net::HttpUtil::GenerateAcceptCharsetHeader(
+      WideToASCII(prefs_->GetString(prefs::kDefaultCharset)));
 
   cookie_policy_.SetType(net::CookiePolicy::FromInt(
       prefs_->GetInteger(prefs::kCookieBehavior)));
 
   const ExtensionList* extensions =
       profile->GetExtensionsService()->extensions();
   for (ExtensionList::const_iterator iter = extensions->begin();
       iter != extensions->end(); ++iter) {
     extension_paths_[(*iter)->id()] = (*iter)->path();
   }
@@ skipping 62 matching lines @@
   if (iter != extension_paths_.end()) {
     return iter->second;
   } else {
     return FilePath();
   }
 }
 
 void ChromeURLRequestContext::OnAcceptLanguageChange(std::string accept_language) {
   DCHECK(MessageLoop::current() ==
          ChromeThread::GetMessageLoop(ChromeThread::IO));
-  accept_language_ = accept_language;
+  accept_language_ =
+      net::HttpUtil::GenerateAcceptLanguageHeader(accept_language);
 }
 
 void ChromeURLRequestContext::OnCookiePolicyChange(net::CookiePolicy::Type type) {
   DCHECK(MessageLoop::current() ==
          ChromeThread::GetMessageLoop(ChromeThread::IO));
   cookie_policy_.SetType(type);
 }
 
 void ChromeURLRequestContext::OnNewExtensions(ExtensionPaths* new_paths) {
   extension_paths_.insert(new_paths->begin(), new_paths->end());
   delete new_paths;
 }
 
 ChromeURLRequestContext::~ChromeURLRequestContext() {
   DCHECK(NULL == prefs_);
 
   NotificationService::current()->Notify(NOTIFY_URL_REQUEST_CONTEXT_RELEASED,
                                          Source<URLRequestContext>(this),
                                          NotificationService::NoDetails());
 
   delete cookie_store_;
   delete http_transaction_factory_;
 
   // Do not delete the proxy service in the case of OTR, as it is owned by the
   // original URLRequestContext.
   if (!is_off_the_record_)
     delete proxy_service_;
 }