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

chrome/browser/speech/speech_recognition_request.cc

 // Copyright (c) 2010 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/speech/speech_recognition_request.h"
 
+#include <vector>
+
 #include "app/l10n_util.h"
 #include "base/json/json_reader.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #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 {
 
 const char* const kDefaultSpeechRecognitionUrl =
     "http://www.google.com/speech-api/v1/recognize?client=chromium&";
 const char* const kHypothesesString = "hypotheses";
 const char* const kUtteranceString = "utterance";
 const char* const kConfidenceString = "confidence";
 
@@ skipping 96 matching lines @@
 bool SpeechRecognitionRequest::Send(const std::string& language,
                                     const std::string& grammar,
                                     const std::string& content_type,
                                     const std::string& audio_data) {
   DCHECK(!url_fetcher_.get());
 
   std::vector<std::string> parts;
   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())
     parts.push_back("grammar=" + EscapeQueryParamValue(grammar, true));
   GURL url(std::string(kDefaultSpeechRecognitionUrl) + JoinString(parts, '&'));
 
   url_fetcher_.reset(URLFetcher::Create(url_fetcher_id_for_tests,
                                         url,
                                         URLFetcher::POST,
                                         this));
@@ skipping 24 matching lines @@
   SpeechInputResultArray result;
   if (!error)
     error = !ParseServerResponse(data, &result);
   url_fetcher_.reset();
 
   DVLOG(1) << "SpeechRecognitionRequest: Invoking delegate with result.";
   delegate_->SetRecognitionResult(error, result);
 }
 
 }  // namespace speech_input