content/browser: Move speech code into content namespace.

content/browser/speech/google_streaming_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_streaming_remote_engine.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/speech/audio_buffer.h"
 #include "content/browser/speech/proto/google_streaming_api.pb.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.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_getter.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_status.h"
 
-using content::BrowserThread;
-using content::SpeechRecognitionError;
-using content::SpeechRecognitionErrorCode;
-using content::SpeechRecognitionHypothesis;
-using content::SpeechRecognitionResult;
 using net::URLFetcher;
 
+namespace content {
 namespace {
 
 const char kWebServiceBaseUrl[] =
     "https://www.google.com/speech-api/full-duplex/v1";
 const char kDownstreamUrl[] = "/down?";
 const char kUpstreamUrl[] = "/up?";
 const int kAudioPacketIntervalMs = 100;
-const speech::AudioEncoder::Codec kDefaultAudioCodec =
-    speech::AudioEncoder::CODEC_FLAC;
+const AudioEncoder::Codec kDefaultAudioCodec = AudioEncoder::CODEC_FLAC;
 
 // This mathces the maximum maxAlternatives value supported by the server.
 const uint32 kMaxMaxAlternatives = 30;
 
 // TODO(hans): Remove this and other logging when we don't need it anymore.
 void DumpResponse(const std::string& response) {
   DVLOG(1) << "------------";
-  speech::proto::SpeechRecognitionEvent event;
+  proto::SpeechRecognitionEvent event;
   if (!event.ParseFromString(response)) {
     DVLOG(1) << "Parse failed!";
     return;
   }
   if (event.has_status())
     DVLOG(1) << "STATUS\t" << event.status();
   for (int i = 0; i < event.result_size(); ++i) {
     DVLOG(1) << "RESULT #" << i << ":";
-    const speech::proto::SpeechRecognitionResult& res = event.result(i);
+    const proto::SpeechRecognitionResult& res = event.result(i);
     if (res.has_final())
       DVLOG(1) << "  FINAL:\t" << res.final();
     if (res.has_stability())
       DVLOG(1) << "  STABILITY:\t" << res.stability();
     for (int j = 0; j < res.alternative_size(); ++j) {
-      const speech::proto::SpeechRecognitionAlternative& alt =
+      const proto::SpeechRecognitionAlternative& alt =
           res.alternative(j);
       if (alt.has_confidence())
         DVLOG(1) << "    CONFIDENCE:\t" << alt.confidence();
       if (alt.has_transcript())
         DVLOG(1) << "    TRANSCRIPT:\t" << alt.transcript();
     }
   }
 }
 
 std::string GetAPIKey() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kSpeechRecognitionWebserviceKey)) {
     DVLOG(1) << "GetAPIKey() used key from command-line.";
     return command_line.GetSwitchValueASCII(
         switches::kSpeechRecognitionWebserviceKey);
   }
 
   std::string api_key = google_apis::GetAPIKey();
   if (api_key.empty())
     DVLOG(1) << "GetAPIKey() returned empty string!";
 
   return api_key;
 }
 
 }  // namespace
 
-namespace speech {
-
 const int GoogleStreamingRemoteEngine::kUpstreamUrlFetcherIdForTests = 0;
 const int GoogleStreamingRemoteEngine::kDownstreamUrlFetcherIdForTests = 1;
 const int GoogleStreamingRemoteEngine::kWebserviceStatusNoError = 0;
 const int GoogleStreamingRemoteEngine::kWebserviceStatusErrorNoMatch = 5;
 
 GoogleStreamingRemoteEngine::GoogleStreamingRemoteEngine(
     net::URLRequestContextGetter* context)
     : url_context_(context),
       encoder_(NULL),
       previous_response_length_(0),
@@ skipping 308 matching lines @@
       ws_event.status() == proto::SpeechRecognitionEvent::STATUS_SUCCESS)) {
     DVLOG(1) << "Received empty response";
     return state_;
   }
 
   if (ws_event.has_status()) {
     switch(ws_event.status()) {
       case proto::SpeechRecognitionEvent::STATUS_SUCCESS:
         break;
       case proto::SpeechRecognitionEvent::STATUS_NO_SPEECH:
-        return Abort(content::SPEECH_RECOGNITION_ERROR_NO_SPEECH);
+        return Abort(SPEECH_RECOGNITION_ERROR_NO_SPEECH);
       case proto::SpeechRecognitionEvent::STATUS_ABORTED:
-        return Abort(content::SPEECH_RECOGNITION_ERROR_ABORTED);
+        return Abort(SPEECH_RECOGNITION_ERROR_ABORTED);
       case proto::SpeechRecognitionEvent::STATUS_AUDIO_CAPTURE:
-        return Abort(content::SPEECH_RECOGNITION_ERROR_AUDIO);
+        return Abort(SPEECH_RECOGNITION_ERROR_AUDIO);
       case proto::SpeechRecognitionEvent::STATUS_NETWORK:
-        return Abort(content::SPEECH_RECOGNITION_ERROR_NETWORK);
+        return Abort(SPEECH_RECOGNITION_ERROR_NETWORK);
       case proto::SpeechRecognitionEvent::STATUS_NOT_ALLOWED:
         // TODO(hans): We need a better error code for this.
-        return Abort(content::SPEECH_RECOGNITION_ERROR_ABORTED);
+        return Abort(SPEECH_RECOGNITION_ERROR_ABORTED);
       case proto::SpeechRecognitionEvent::STATUS_SERVICE_NOT_ALLOWED:
         // TODO(hans): We need a better error code for this.
-        return Abort(content::SPEECH_RECOGNITION_ERROR_ABORTED);
+        return Abort(SPEECH_RECOGNITION_ERROR_ABORTED);
       case proto::SpeechRecognitionEvent::STATUS_BAD_GRAMMAR:
-        return Abort(content::SPEECH_RECOGNITION_ERROR_BAD_GRAMMAR);
+        return Abort(SPEECH_RECOGNITION_ERROR_BAD_GRAMMAR);
       case proto::SpeechRecognitionEvent::STATUS_LANGUAGE_NOT_SUPPORTED:
         // TODO(hans): We need a better error code for this.
-        return Abort(content::SPEECH_RECOGNITION_ERROR_ABORTED);
+        return Abort(SPEECH_RECOGNITION_ERROR_ABORTED);
     }
   }
 
   for (int i = 0; i < ws_event.result_size(); ++i) {
     const proto::SpeechRecognitionResult& ws_result = ws_event.result(i);
     SpeechRecognitionResult result;
     result.is_provisional = !(ws_result.has_final() && ws_result.final());
 
     if (!result.is_provisional)
       got_last_definitive_result_ = true;
@@ skipping 64 matching lines @@
   DCHECK(!upstream_fetcher_.get());
   DCHECK(downstream_fetcher_.get());
 
   DVLOG(1) <<  "Closing downstream.";
   downstream_fetcher_.reset();
   return STATE_IDLE;
 }
 
 GoogleStreamingRemoteEngine::FSMState
 GoogleStreamingRemoteEngine::AbortSilently(const FSMEventArgs&) {
-  return Abort(content::SPEECH_RECOGNITION_ERROR_NONE);
+  return Abort(SPEECH_RECOGNITION_ERROR_NONE);
 }
 
 GoogleStreamingRemoteEngine::FSMState
 GoogleStreamingRemoteEngine::AbortWithError(const FSMEventArgs&) {
-  return Abort(content::SPEECH_RECOGNITION_ERROR_NETWORK);
+  return Abort(SPEECH_RECOGNITION_ERROR_NETWORK);
 }
 
 GoogleStreamingRemoteEngine::FSMState GoogleStreamingRemoteEngine::Abort(
     SpeechRecognitionErrorCode error_code) {
   DVLOG(1) << "Aborting with error " << error_code;
 
-  if (error_code != content::SPEECH_RECOGNITION_ERROR_NONE) {
+  if (error_code != SPEECH_RECOGNITION_ERROR_NONE) {
     delegate()->OnSpeechRecognitionEngineError(
         SpeechRecognitionError(error_code));
   }
   downstream_fetcher_.reset();
   upstream_fetcher_.reset();
   encoder_.reset();
   return STATE_IDLE;
 }
 
 GoogleStreamingRemoteEngine::FSMState
@@ skipping 39 matching lines @@
   return base::HexEncode(reinterpret_cast<void*>(&key), sizeof(key));
 }
 
 GoogleStreamingRemoteEngine::FSMEventArgs::FSMEventArgs(FSMEvent event_value)
     : event(event_value) {
 }
 
 GoogleStreamingRemoteEngine::FSMEventArgs::~FSMEventArgs() {
 }
 
-}  // namespace speech
+}  // namespace content