Language tag for speech.

This is the 3rd in a 4-sided patch to add language attribute support to speech input.

The other patches can be found here:
  1st - http://codereview.chromium.org/3615005/show
  2nd - https://bugs.webkit.org/show_bug.cgi?id=47089
  4th - https://bugs.webkit.org/show_bug.cgi?id=47420

This patch will be submitted once the webkit change has been rolled into chromium DEPS. Also, a last webkit cleanup patch will be submitted at any point after the 2nd patch.

BUG=53598
TEST=

Review URL: http://codereview.chromium.org/3595018

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

1 files changed, 10 insertions, 3 deletions

diff --git a/chrome/browser/speech/speech_recognition_request.cc b/chrome/browser/speech/speech_recognition_request.cc
index d3a9837..e17f69b1 100644
--- a/chrome/browser/speech/speech_recognition_request.cc
+++ b/chrome/browser/speech/speech_recognition_request.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/speech/speech_recognition_request.h"
 
+#include "app/l10n_util.h"
 #include "base/json/json_reader.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ -117,14 +118,20 @@ SpeechRecognitionRequest::SpeechRecognitionRequest(
 
 SpeechRecognitionRequest::~SpeechRecognitionRequest() {}
 
-bool SpeechRecognitionRequest::Send(const std::string& grammar,
+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;
-  // TODO(leandro): Replace with the language tag given by WebKit.

-  parts.push_back("lang=en-us");
+  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 (!grammar.empty())
     parts.push_back("grammar=" + EscapeQueryParamValue(grammar, true));
   GURL url(std::string(kDefaultSpeechRecognitionUrl) + JoinString(parts, '&'));