Adding support for the SpeechRecognition.maxAlternatives JS API parameter (Speech CL2.5)

content/browser/speech/google_one_shot_remote_engine.cc

 // Copyright (c) 2012 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 "content/browser/speech/google_one_shot_remote_engine.h"
 
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/string_number_conversions.h"
@@ skipping 19 matching lines @@
     "https://www.google.com/speech-api/v1/recognize?xjerr=1&client=chromium&";
 const char* const kStatusString = "status";
 const char* const kHypothesesString = "hypotheses";
 const char* const kUtteranceString = "utterance";
 const char* const kConfidenceString = "confidence";
 const int kWebServiceStatusNoError = 0;
 const int kWebServiceStatusNoSpeech = 4;
 const int kWebServiceStatusNoMatch = 5;
 const speech::AudioEncoder::Codec kDefaultAudioCodec =
     speech::AudioEncoder::CODEC_FLAC;
-// TODO(satish): Remove this hardcoded value once the page is allowed to
-// set this via an attribute.
-const int kMaxResults = 6;
 
 bool ParseServerResponse(const std::string& response_body,
                          SpeechRecognitionResult* result,
                          SpeechRecognitionError* error) {
   if (response_body.empty()) {
     LOG(WARNING) << "ParseServerResponse: Response was empty.";
     return false;
   }
   DVLOG(1) << "ParseServerResponse: Parsing response " << response_body;
 
@@ skipping 138 matching lines @@
 
   if (!config_.grammars.empty()) {
     DCHECK_EQ(config_.grammars.size(), 1U);
     parts.push_back("lm=" + net::EscapeQueryParamValue(config_.grammars[0].url,
                                                        true));
   }
 
   if (!config_.hardware_info.empty())
     parts.push_back("xhw=" + net::EscapeQueryParamValue(config_.hardware_info,
                                                         true));
-  parts.push_back("maxresults=" + base::IntToString(kMaxResults));
+  parts.push_back("maxresults=" + base::UintToString(config_.max_hypotheses));
   parts.push_back(config_.filter_profanities ? "pfilter=2" : "pfilter=0");
 
   GURL url(std::string(kDefaultSpeechRecognitionUrl) + JoinString(parts, '&'));
 
   encoder_.reset(AudioEncoder::Create(kDefaultAudioCodec,
                                       config_.audio_sample_rate,
                                       config_.audio_num_bits_per_sample));
   DCHECK(encoder_.get());
   url_fetcher_.reset(net::URLFetcher::Create(url_fetcher_id_for_tests,
                                              url,
@@ skipping 73 matching lines @@
 
 bool GoogleOneShotRemoteEngine::IsRecognitionPending() const {
   return url_fetcher_ != NULL;
 }
 
 int GoogleOneShotRemoteEngine::GetDesiredAudioChunkDurationMs() const {
   return kAudioPacketIntervalMs;
 }
 
 }  // namespace speech