Renamed speech input implementation from to speech_recognition_*. The namespace has been renamed fr…

content/browser/speech/speech_recognition_request.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/common/net/url_fetcher_impl.h"
-#include "content/public/common/speech_input_result.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::SpeechInputResult* result) {
+                         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));
@@ skipping 13 matching lines @@
   // 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_INPUT_ERROR_NONE:
-  case content::SPEECH_INPUT_ERROR_NO_SPEECH:
-  case content::SPEECH_INPUT_ERROR_NO_MATCH:
+  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::SpeechInputError>(status);
+  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)) {
@@ skipping 23 matching lines @@
     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::SpeechInputHypothesis(
+    result->hypotheses.push_back(content::SpeechRecognitionHypothesis(
         utterance, confidence));
   }
 
   if (index < hypotheses_list->GetSize()) {
     result->hypotheses.clear();
     return false;
   }
 
   return true;
 }
 
 }  // namespace
 
-namespace speech_input {
+namespace speech {
 
 int SpeechRecognitionRequest::url_fetcher_id_for_tests = 0;
 
 SpeechRecognitionRequest::SpeechRecognitionRequest(
     net::URLRequestContextGetter* context, Delegate* delegate)
     : url_context_(context),
       delegate_(delegate) {
   DCHECK(delegate);
 }
 
@@ skipping 55 matching lines @@
 void SpeechRecognitionRequest::UploadAudioChunk(const std::string& audio_data,
                                                 bool is_last_chunk) {
   DCHECK(url_fetcher_.get());
   url_fetcher_->AppendChunkToUpload(audio_data, is_last_chunk);
 }
 
 void SpeechRecognitionRequest::OnURLFetchComplete(
     const content::URLFetcher* source) {
   DCHECK_EQ(url_fetcher_.get(), source);
 
-  content::SpeechInputResult result;
+  content::SpeechRecognitionResult result;
   std::string data;
   if (!source->GetStatus().is_success() || source->GetResponseCode() != 200 ||
       !source->GetResponseAsString(&data) ||
       !ParseServerResponse(data, &result)) {
-    result.error = content::SPEECH_INPUT_ERROR_NETWORK;
+    result.error = content::SPEECH_RECOGNITION_ERROR_NETWORK;
   }
 
   DVLOG(1) << "SpeechRecognitionRequest: Invoking delegate with result.";
   url_fetcher_.reset();
   delegate_->SetRecognitionResult(result);
 }
 
-}  // namespace speech_input
+}  // namespace speech