Index: content/browser/speech/speech_recognition_request.cc |
diff --git a/content/browser/speech/speech_recognition_request.cc b/content/browser/speech/speech_recognition_request.cc |
deleted file mode 100644 |
index a14369976d45ff0c267ef0af7221f4cac547fc32..0000000000000000000000000000000000000000 |
--- a/content/browser/speech/speech_recognition_request.cc |
+++ /dev/null |
@@ -1,228 +0,0 @@ |
-// 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/speech_recognition_request.h" |
- |
-#include <vector> |
- |
-#include "base/json/json_reader.h" |
-#include "base/string_number_conversions.h" |
-#include "base/string_util.h" |
-#include "base/values.h" |
-#include "content/browser/speech/audio_buffer.h" |
-#include "content/common/net/url_fetcher_impl.h" |
-#include "content/public/common/speech_recognition_result.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_context_getter.h" |
-#include "net/url_request/url_request_status.h" |
- |
-namespace { |
- |
-const char* const kDefaultSpeechRecognitionUrl = |
- "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"; |
- |
-// 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, |
- content::SpeechRecognitionResult* result) { |
- if (response_body.empty()) { |
- LOG(WARNING) << "ParseServerResponse: Response was empty."; |
- return false; |
- } |
- DVLOG(1) << "ParseServerResponse: Parsing response " << response_body; |
- |
- // Parse the response, ignoring comments. |
- std::string error_msg; |
- scoped_ptr<Value> response_value(base::JSONReader::ReadAndReturnError( |
- response_body, false, NULL, &error_msg)); |
- if (response_value == NULL) { |
- LOG(WARNING) << "ParseServerResponse: JSONReader failed : " << error_msg; |
- return false; |
- } |
- |
- if (!response_value->IsType(Value::TYPE_DICTIONARY)) { |
- VLOG(1) << "ParseServerResponse: Unexpected response type " |
- << response_value->GetType(); |
- return false; |
- } |
- const DictionaryValue* response_object = |
- static_cast<DictionaryValue*>(response_value.get()); |
- |
- // Get the status. |
- int status; |
- if (!response_object->GetInteger(kStatusString, &status)) { |
- VLOG(1) << "ParseServerResponse: " << kStatusString |
- << " is not a valid integer value."; |
- return false; |
- } |
- |
- // Process the status. |
- switch (status) { |
- case content::SPEECH_RECOGNITION_ERROR_NONE: |
- case content::SPEECH_RECOGNITION_ERROR_NO_SPEECH: |
- case content::SPEECH_RECOGNITION_ERROR_NO_MATCH: |
- break; |
- |
- default: |
- // Other status codes should not be returned by the server. |
- VLOG(1) << "ParseServerResponse: unexpected status code " << status; |
- return false; |
- } |
- |
- result->error = static_cast<content::SpeechRecognitionErrorCode>(status); |
- |
- // Get the hypotheses. |
- Value* hypotheses_value = NULL; |
- if (!response_object->Get(kHypothesesString, &hypotheses_value)) { |
- VLOG(1) << "ParseServerResponse: Missing hypotheses attribute."; |
- return false; |
- } |
- |
- DCHECK(hypotheses_value); |
- if (!hypotheses_value->IsType(Value::TYPE_LIST)) { |
- VLOG(1) << "ParseServerResponse: Unexpected hypotheses type " |
- << hypotheses_value->GetType(); |
- return false; |
- } |
- |
- const ListValue* hypotheses_list = static_cast<ListValue*>(hypotheses_value); |
- |
- size_t index = 0; |
- for (; index < hypotheses_list->GetSize(); ++index) { |
- Value* hypothesis = NULL; |
- if (!hypotheses_list->Get(index, &hypothesis)) { |
- LOG(WARNING) << "ParseServerResponse: Unable to read hypothesis value."; |
- break; |
- } |
- DCHECK(hypothesis); |
- if (!hypothesis->IsType(Value::TYPE_DICTIONARY)) { |
- LOG(WARNING) << "ParseServerResponse: Unexpected value type " |
- << hypothesis->GetType(); |
- break; |
- } |
- |
- const DictionaryValue* hypothesis_value = |
- static_cast<DictionaryValue*>(hypothesis); |
- string16 utterance; |
- if (!hypothesis_value->GetString(kUtteranceString, &utterance)) { |
- LOG(WARNING) << "ParseServerResponse: Missing utterance value."; |
- break; |
- } |
- |
- // It is not an error if the 'confidence' field is missing. |
- double confidence = 0.0; |
- hypothesis_value->GetDouble(kConfidenceString, &confidence); |
- |
- result->hypotheses.push_back(content::SpeechRecognitionHypothesis( |
- utterance, confidence)); |
- } |
- |
- if (index < hypotheses_list->GetSize()) { |
- result->hypotheses.clear(); |
- return false; |
- } |
- |
- return true; |
-} |
- |
-} // namespace |
- |
-namespace speech { |
- |
-int SpeechRecognitionRequest::url_fetcher_id_for_tests = 0; |
- |
-SpeechRecognitionRequest::SpeechRecognitionRequest( |
- net::URLRequestContextGetter* context, Delegate* delegate) |
- : url_context_(context), |
- delegate_(delegate) { |
- DCHECK(delegate); |
-} |
- |
-SpeechRecognitionRequest::~SpeechRecognitionRequest() {} |
- |
-void SpeechRecognitionRequest::Start(const std::string& language, |
- const std::string& grammar, |
- bool filter_profanities, |
- const std::string& hardware_info, |
- const std::string& origin_url, |
- const std::string& content_type) { |
- DCHECK(!url_fetcher_.get()); |
- |
- std::vector<std::string> parts; |
- |
- std::string lang_param = language; |
- if (lang_param.empty() && url_context_) { |
- // 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", "" |
- net::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(",;"); |
- lang_param = accepted_language_list.substr(0, separator); |
- } |
- if (lang_param.empty()) |
- lang_param = "en-US"; |
- parts.push_back("lang=" + net::EscapeQueryParamValue(lang_param, true)); |
- |
- if (!grammar.empty()) |
- parts.push_back("lm=" + net::EscapeQueryParamValue(grammar, true)); |
- if (!hardware_info.empty()) |
- parts.push_back("xhw=" + net::EscapeQueryParamValue(hardware_info, true)); |
- parts.push_back("maxresults=" + base::IntToString(kMaxResults)); |
- parts.push_back(filter_profanities ? "pfilter=2" : "pfilter=0"); |
- |
- GURL url(std::string(kDefaultSpeechRecognitionUrl) + JoinString(parts, '&')); |
- |
- url_fetcher_.reset(URLFetcherImpl::Create(url_fetcher_id_for_tests, |
- url, |
- URLFetcherImpl::POST, |
- this)); |
- url_fetcher_->SetChunkedUpload(content_type); |
- url_fetcher_->SetRequestContext(url_context_); |
- url_fetcher_->SetReferrer(origin_url); |
- |
- // The speech recognition API does not require user identification as part |
- // of requests, so we don't send cookies or auth data for these requests to |
- // prevent any accidental connection between users who are logged into the |
- // domain for other services (e.g. bookmark sync) with the speech requests. |
- url_fetcher_->SetLoadFlags( |
- net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_DO_NOT_SEND_COOKIES | |
- net::LOAD_DO_NOT_SEND_AUTH_DATA); |
- url_fetcher_->Start(); |
-} |
- |
-void SpeechRecognitionRequest::UploadAudioChunk(const AudioChunk& audio_chunk, |
- bool is_last_chunk) { |
- DCHECK(url_fetcher_.get()); |
- url_fetcher_->AppendChunkToUpload(audio_chunk.AsString(), is_last_chunk); |
-} |
- |
-void SpeechRecognitionRequest::OnURLFetchComplete( |
- const content::URLFetcher* source) { |
- DCHECK_EQ(url_fetcher_.get(), source); |
- |
- content::SpeechRecognitionResult result; |
- std::string data; |
- if (!source->GetStatus().is_success() || source->GetResponseCode() != 200 || |
- !source->GetResponseAsString(&data) || |
- !ParseServerResponse(data, &result)) { |
- result.error = content::SPEECH_RECOGNITION_ERROR_NETWORK; |
- } |
- |
- DVLOG(1) << "SpeechRecognitionRequest: Invoking delegate with result."; |
- url_fetcher_.reset(); |
- delegate_->SetRecognitionResult(result); |
-} |
- |
-} // namespace speech |