content/browser: Move speech code into content namespace.

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"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "content/browser/speech/audio_buffer.h"
 #include "content/public/common/speech_recognition_error.h"
 #include "content/public/common/speech_recognition_result.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.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"
 
-using content::SpeechRecognitionError;
-using content::SpeechRecognitionHypothesis;
-using content::SpeechRecognitionResult;
-
+namespace content {
 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";
 const int kWebServiceStatusNoError = 0;
 const int kWebServiceStatusNoSpeech = 4;
 const int kWebServiceStatusNoMatch = 5;
-const speech::AudioEncoder::Codec kDefaultAudioCodec =
-    speech::AudioEncoder::CODEC_FLAC;
+const AudioEncoder::Codec kDefaultAudioCodec = AudioEncoder::CODEC_FLAC;
 
 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 20 matching lines @@
     VLOG(1) << "ParseServerResponse: " << kStatusString
             << " is not a valid integer value.";
     return false;
   }
 
   // Process the status.
   switch (status) {
     case kWebServiceStatusNoError:
       break;
     case kWebServiceStatusNoSpeech:
-      error->code = content::SPEECH_RECOGNITION_ERROR_NO_SPEECH;
+      error->code = SPEECH_RECOGNITION_ERROR_NO_SPEECH;
       return false;
     case kWebServiceStatusNoMatch:
-      error->code = content::SPEECH_RECOGNITION_ERROR_NO_MATCH;
+      error->code = SPEECH_RECOGNITION_ERROR_NO_MATCH;
       return false;
     default:
-      error->code = content::SPEECH_RECOGNITION_ERROR_NETWORK;
+      error->code = SPEECH_RECOGNITION_ERROR_NETWORK;
       // Other status codes should not be returned by the server.
       VLOG(1) << "ParseServerResponse: unexpected status code " << status;
       return false;
   }
 
   // Get the hypotheses.
   const Value* hypotheses_value = NULL;
   if (!response_object->Get(kHypothesesString, &hypotheses_value)) {
     VLOG(1) << "ParseServerResponse: Missing hypotheses attribute.";
     return false;
@@ skipping 43 matching lines @@
 
   if (index < hypotheses_list->GetSize()) {
     result->hypotheses.clear();
     return false;
   }
   return true;
 }
 
 }  // namespace
 
-namespace speech {
-
 const int GoogleOneShotRemoteEngine::kAudioPacketIntervalMs = 100;
 int GoogleOneShotRemoteEngine::url_fetcher_id_for_tests = 0;
 
 GoogleOneShotRemoteEngine::GoogleOneShotRemoteEngine(
     net::URLRequestContextGetter* context)
     : url_context_(context) {
 }
 
 GoogleOneShotRemoteEngine::~GoogleOneShotRemoteEngine() {}
 
@@ skipping 96 matching lines @@
   DCHECK(!encoded_dummy_data->IsEmpty());
   encoder_.reset();
 
   url_fetcher_->AppendChunkToUpload(encoded_dummy_data->AsString(), true);
 }
 
 void GoogleOneShotRemoteEngine::OnURLFetchComplete(
     const net::URLFetcher* source) {
   DCHECK_EQ(url_fetcher_.get(), source);
   SpeechRecognitionResult result;
-  SpeechRecognitionError error(content::SPEECH_RECOGNITION_ERROR_NETWORK);
+  SpeechRecognitionError error(SPEECH_RECOGNITION_ERROR_NETWORK);
   std::string data;
 
   // The default error code in case of parse errors is NETWORK_FAILURE, however
   // ParseServerResponse can change the error to a more appropriate one.
   bool error_occurred = (!source->GetStatus().is_success() ||
                         source->GetResponseCode() != 200 ||
                         !source->GetResponseAsString(&data) ||
                         !ParseServerResponse(data, &result, &error));
   url_fetcher_.reset();
   if (error_occurred) {
     DVLOG(1) << "GoogleOneShotRemoteEngine: Network Error " << error.code;
     delegate()->OnSpeechRecognitionEngineError(error);
   } else {
     DVLOG(1) << "GoogleOneShotRemoteEngine: Invoking delegate with result.";
     delegate()->OnSpeechRecognitionEngineResult(result);
   }
 }
 
 bool GoogleOneShotRemoteEngine::IsRecognitionPending() const {
   return url_fetcher_ != NULL;
 }
 
 int GoogleOneShotRemoteEngine::GetDesiredAudioChunkDurationMs() const {
   return kAudioPacketIntervalMs;
 }
 
-}  // namespace speech
+}  // namespace content