content/browser: Move speech code into content namespace.

content/browser/speech/speech_recognizer.h

 // 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.
 
 #ifndef CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_H_
 #define CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/speech/endpointer/endpointer.h"
 #include "content/browser/speech/speech_recognition_engine.h"
 #include "content/public/common/speech_recognition_error.h"
 #include "content/public/common/speech_recognition_result.h"
 #include "media/audio/audio_input_controller.h"
 #include "net/url_request/url_request_context_getter.h"
 
-namespace content {
-class SpeechRecognitionEventListener;
-}
-
 namespace media {
 class AudioManager;
 }
 
-namespace speech {
+namespace content {
+
+class SpeechRecognitionEventListener;
+
 // Handles speech recognition for a session (identified by |session_id|), taking
 // care of audio capture, silence detection/endpointer and interaction with the
 // SpeechRecognitionEngine.
 class CONTENT_EXPORT SpeechRecognizer
     : public base::RefCountedThreadSafe<SpeechRecognizer>,
       public media::AudioInputController::EventHandler,
       public NON_EXPORTED_BASE(SpeechRecognitionEngineDelegate) {
  public:
   static const int kAudioSampleRate;
   static const media::ChannelLayout kChannelLayout;
   static const int kNumBitsPerAudioSample;
   static const int kNoSpeechTimeoutMs;
   static const int kEndpointerEstimationTimeMs;
 
   static void SetAudioManagerForTests(media::AudioManager* audio_manager);
 
-  SpeechRecognizer(
-      content::SpeechRecognitionEventListener* listener,
-      int session_id,
-      bool is_single_shot,
-      SpeechRecognitionEngine* engine);
+  SpeechRecognizer(SpeechRecognitionEventListener* listener,
+                   int session_id,
+                   bool is_single_shot,
+                   SpeechRecognitionEngine* engine);
 
   void StartRecognition();
   void AbortRecognition();
   void StopAudioCapture();
   bool IsActive() const;
   bool IsCapturingAudio() const;
   const SpeechRecognitionEngine& recognition_engine() const;
 
  private:
   friend class base::RefCountedThreadSafe<SpeechRecognizer>;
@@ skipping 20 matching lines @@
     EVENT_MAX_VALUE = EVENT_AUDIO_ERROR
   };
 
   struct FSMEventArgs {
     explicit FSMEventArgs(FSMEvent event_value);
     ~FSMEventArgs();
 
     FSMEvent event;
     int audio_error_code;
     scoped_refptr<AudioChunk> audio_data;
-    content::SpeechRecognitionResult engine_result;
-    content::SpeechRecognitionError engine_error;
+    SpeechRecognitionResult engine_result;
+    SpeechRecognitionError engine_error;
   };
 
   virtual ~SpeechRecognizer();
 
   // Entry point for pushing any new external event into the recognizer FSM.
   void DispatchEvent(const FSMEventArgs& event_args);
 
   // Defines the behavior of the recognizer FSM, selecting the appropriate
   // transition according to the current state and event.
   FSMState ExecuteTransitionAndGetNextState(const FSMEventArgs& args);
 
   // Process a new audio chunk in the audio pipeline (endpointer, vumeter, etc).
   void ProcessAudioPipeline(const AudioChunk& raw_audio);
 
   // The methods below handle transitions of the recognizer FSM.
   FSMState StartRecording(const FSMEventArgs& event_args);
   FSMState StartRecognitionEngine(const FSMEventArgs& event_args);
   FSMState WaitEnvironmentEstimationCompletion(const FSMEventArgs& event_args);
   FSMState DetectUserSpeechOrTimeout(const FSMEventArgs& event_args);
   FSMState StopCaptureAndWaitForResult(const FSMEventArgs& event_args);
   FSMState ProcessIntermediateResult(const FSMEventArgs& event_args);
   FSMState ProcessFinalResult(const FSMEventArgs& event_args);
   FSMState AbortSilently(const FSMEventArgs& event_args);
   FSMState AbortWithError(const FSMEventArgs& event_args);
-  FSMState Abort(const content::SpeechRecognitionError& error);
+  FSMState Abort(const SpeechRecognitionError& error);
   FSMState DetectEndOfSpeech(const FSMEventArgs& event_args);
   FSMState DoNothing(const FSMEventArgs& event_args) const;
   FSMState NotFeasible(const FSMEventArgs& event_args);
 
   // Returns the time span of captured audio samples since the start of capture.
   int GetElapsedTimeMs() const;
 
   // Calculates the input volume to be displayed in the UI, triggering the
   // OnAudioLevelsChange event accordingly.
   void UpdateSignalAndNoiseLevels(const float& rms, bool clip_detected);
 
   void CloseAudioControllerAsynchronously();
 
   // Callback called on IO thread by audio_controller->Close().
   void OnAudioClosed(media::AudioInputController*);
 
   // AudioInputController::EventHandler methods.
   virtual void OnCreated(media::AudioInputController* controller) OVERRIDE {}
   virtual void OnRecording(media::AudioInputController* controller) OVERRIDE {}
   virtual void OnError(media::AudioInputController* controller,
                        int error_code) OVERRIDE;
   virtual void OnData(media::AudioInputController* controller,
                       const uint8* data, uint32 size) OVERRIDE;
 
   // SpeechRecognitionEngineDelegate methods.
   virtual void OnSpeechRecognitionEngineResult(
-      const content::SpeechRecognitionResult& result) OVERRIDE;
+      const SpeechRecognitionResult& result) OVERRIDE;
   virtual void OnSpeechRecognitionEngineError(
-      const content::SpeechRecognitionError& error) OVERRIDE;
+      const SpeechRecognitionError& error) OVERRIDE;
 
   static media::AudioManager* audio_manager_for_tests_;
 
-  content::SpeechRecognitionEventListener* listener_;
+  SpeechRecognitionEventListener* listener_;
   scoped_ptr<SpeechRecognitionEngine> recognition_engine_;
   Endpointer endpointer_;
   scoped_refptr<media::AudioInputController> audio_controller_;
   int session_id_;
   int num_samples_recorded_;
   float audio_level_;
   bool is_dispatching_event_;
   bool is_single_shot_;
   FSMState state_;
 
   DISALLOW_COPY_AND_ASSIGN(SpeechRecognizer);
 };
 
-}  // namespace speech
+}  // namespace content
 
 #endif  // CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_H_