content/browser: Move speech code into content namespace.

content/browser/speech/speech_recognizer.h

Index: content/browser/speech/speech_recognizer.h
diff --git a/content/browser/speech/speech_recognizer.h b/content/browser/speech/speech_recognizer.h
index 9ac813c00c3da6c9c72d82a086ff59b8e8d543b8..7df44fec8362f90685171399bc21fdd444e3be21 100644
--- a/content/browser/speech/speech_recognizer.h
+++ b/content/browser/speech/speech_recognizer.h
@@ -15,15 +15,14 @@
 #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.
@@ -40,11 +39,10 @@ class CONTENT_EXPORT SpeechRecognizer
 
   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();
@@ -85,8 +83,8 @@ class CONTENT_EXPORT SpeechRecognizer
     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();
@@ -111,7 +109,7 @@ class CONTENT_EXPORT SpeechRecognizer
   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);
@@ -138,13 +136,13 @@ class CONTENT_EXPORT SpeechRecognizer
 
   // 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_;
@@ -158,6 +156,6 @@ class CONTENT_EXPORT SpeechRecognizer
   DISALLOW_COPY_AND_ASSIGN(SpeechRecognizer);
 };
 
-}  // namespace speech
+}  // namespace content
 
 #endif  // CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_H_