Locale access from the IO thread for null language tags in speech.

chrome/browser/speech/speech_recognition_request.cc

Index: chrome/browser/speech/speech_recognition_request.cc
diff --git a/chrome/browser/speech/speech_recognition_request.cc b/chrome/browser/speech/speech_recognition_request.cc
index e17f69b1f09c2275cb31f54d1e97647c00602773..ea7bb15ae3874174db4dc8dc3af313898abd1e3a 100644
--- a/chrome/browser/speech/speech_recognition_request.cc
+++ b/chrome/browser/speech/speech_recognition_request.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/speech/speech_recognition_request.h"
 
+#include <vector>
+
 #include "app/l10n_util.h"
 #include "base/json/json_reader.h"
 #include "base/string_util.h"
@@ -12,6 +14,7 @@
 #include "chrome/common/net/url_request_context_getter.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
+#include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_status.h"
 
 namespace {
@@ -128,8 +131,19 @@ bool SpeechRecognitionRequest::Send(const std::string& language,
   if (!language.empty()) {
     parts.push_back("lang=" + EscapeQueryParamValue(language, true));
   } else {
-    std::string app_locale = l10n_util::GetApplicationLocale("");
-    parts.push_back("lang=" + EscapeQueryParamValue(app_locale, true));
+    // If no language is provided then we use the first from the accepted
+    // language list. If this list is empty then it defaults to "en-US".
+    // Example of the contents of this list: "es,en-GB;q=0.8", ""
+    std::string language;
+    if (url_context_) {
+      URLRequestContext* request_context = url_context_->GetURLRequestContext();
+      DCHECK(request_context);
+      std::string accepted_language_list = request_context->accept_language();
+      size_t separator = accepted_language_list.find_first_of(",;");
+      language = accepted_language_list.substr(0, separator);
+    }
+    if (language.empty()) language = "en-US";

[Satish, 2010/11/16 14:23:42]

Having a local var with the same name 'language' might be confusing to readers.
How about:

std::string lang_param(language);
if (lang_param.empty() && url_context_) {
  ... new code above this line ...
}
if (lang_param.empty()) lang_param = "en-US";
parts.push_back(...)

[Leandro Graciá Gil, 2010/11/16 17:03:00]

Done.

+    parts.push_back("lang=" + EscapeQueryParamValue(language, true));
   }
 
   if (!grammar.empty())