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

content/browser/speech/speech_recognition_dispatcher_host.h

Index: content/browser/speech/speech_recognition_dispatcher_host.h
diff --git a/content/browser/speech/speech_input_dispatcher_host.h b/content/browser/speech/speech_recognition_dispatcher_host.h
similarity index 53%
rename from content/browser/speech/speech_input_dispatcher_host.h
rename to content/browser/speech/speech_recognition_dispatcher_host.h
index 5e38f371357bb498b8867f531f24e8cc83c2ea0d..dd1921267a3f3d03a36dbc2a628e9363f67da896 100644
--- a/content/browser/speech/speech_input_dispatcher_host.h
+++ b/content/browser/speech/speech_recognition_dispatcher_host.h
@@ -2,8 +2,8 @@
 // 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_INPUT_DISPATCHER_HOST_H_
-#define CONTENT_BROWSER_SPEECH_SPEECH_INPUT_DISPATCHER_HOST_H_
+#ifndef CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_DISPATCHER_HOST_H_
+#define CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_DISPATCHER_HOST_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "content/common/content_export.h"
@@ -11,32 +11,32 @@
 #include "net/url_request/url_request_context_getter.h"
 
 class AudioManager;
-struct SpeechInputHostMsg_StartRecognition_Params;
+struct SpeechRecognitionHostMsg_StartRequest_Params;
 
 namespace content {
-class SpeechInputPreferences;
+class SpeechRecognitionPreferences;
 struct SpeechInputResult;
 }
 
-namespace speech_input {
+namespace speech {
 
-class SpeechInputManagerImpl;
+class SpeechRecognitionManagerImpl;
 
-// SpeechInputDispatcherHost is a delegate for Speech API messages used by
+// SpeechRecognitionDispatcherHost is a delegate for Speech API messages used by
 // RenderMessageFilter.
-// It's the complement of SpeechInputDispatcher (owned by RenderView).
-class CONTENT_EXPORT SpeechInputDispatcherHost
+// It's the complement of SpeechRecognitionDispatcher (owned by RenderView).
+class CONTENT_EXPORT SpeechRecognitionDispatcherHost
     : public content::BrowserMessageFilter {
  public:
-  class SpeechInputCallers;
+  class Callers;
 
-  SpeechInputDispatcherHost(
+  SpeechRecognitionDispatcherHost(
       int render_process_id,
       net::URLRequestContextGetter* context_getter,
-      content::SpeechInputPreferences* speech_input_preferences,
+      content::SpeechRecognitionPreferences* recognition_preferences,
       AudioManager* audio_manager);
 
-  // Methods called by SpeechInputManagerImpl.
+  // Methods called by SpeechRecognitionManagerImpl.
   void SetRecognitionResult(int caller_id,
                             const content::SpeechInputResult& result);
   void DidCompleteRecording(int caller_id);
@@ -47,32 +47,32 @@ class CONTENT_EXPORT SpeechInputDispatcherHost
                                  bool* message_was_ok) OVERRIDE;
 
   // Singleton manager setter useful for tests.
-  static void set_manager(SpeechInputManagerImpl* manager);
+  static void set_manager(SpeechRecognitionManagerImpl* manager);
 
  private:
-  virtual ~SpeechInputDispatcherHost();
+  virtual ~SpeechRecognitionDispatcherHost();
 
   void OnStartRecognition(
-      const SpeechInputHostMsg_StartRecognition_Params &params);
+      const SpeechRecognitionHostMsg_StartRequest_Params &params);
   void OnCancelRecognition(int render_view_id, int request_id);
   void OnStopRecording(int render_view_id, int request_id);
 
-  // Returns the speech input manager to forward events to, creating one if
-  // needed.
-  SpeechInputManagerImpl* manager();
+  // Returns the speech recognition manager to forward events to, creating one
+  // if needed.
+  SpeechRecognitionManagerImpl* manager();
 
   int render_process_id_;
   bool may_have_pending_requests_;  // Set if we received any speech IPC request
 
   scoped_refptr<net::URLRequestContextGetter> context_getter_;
-  scoped_refptr<content::SpeechInputPreferences> speech_input_preferences_;
+  scoped_refptr<content::SpeechRecognitionPreferences> recognition_preferences_;
   AudioManager* audio_manager_;
 
-  static SpeechInputManagerImpl* manager_;
+  static SpeechRecognitionManagerImpl* manager_;
 
-  DISALLOW_COPY_AND_ASSIGN(SpeechInputDispatcherHost);
+  DISALLOW_COPY_AND_ASSIGN(SpeechRecognitionDispatcherHost);
 };
 
-}  // namespace speech_input
+}  // namespace speech
 
-#endif  // CONTENT_BROWSER_SPEECH_SPEECH_INPUT_DISPATCHER_HOST_H_
+#endif  // CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_DISPATCHER_HOST_H_