Move SpeechRecognizer delegate into its own header file and put it in the content namespace.

content/browser/speech/speech_input_manager.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_INPUT_MANAGER_H_
 #define CONTENT_BROWSER_SPEECH_SPEECH_INPUT_MANAGER_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
-#include "content/browser/speech/speech_recognizer.h"
+#include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
+#include "content/public/browser/speech_recognizer_delegate.h"
 #include "ui/gfx/rect.h"
 
+class AudioManager;
+
 namespace content {
 class ResourceContext;
 class SpeechInputPreferences;
 struct SpeechInputResult;
 }
 
+namespace net {
+class URLRequestContextGetter;
+}
+
 namespace speech_input {
+class SpeechRecognizer;
 
 // This is the gatekeeper for speech recognition in the browser process. It
 // handles requests received from various render views and makes sure only one
 // of them can use speech recognition at a time. It also sends recognition
 // results and status events to the render views when required.
-class CONTENT_EXPORT SpeechInputManager : public SpeechRecognizerDelegate {
+class CONTENT_EXPORT SpeechInputManager
+    : public content::SpeechRecognizerDelegate {
  public:
   // Implemented by the dispatcher host to relay events to the render views.
   class Delegate {
    public:
     virtual void SetRecognitionResult(
         int caller_id,
         const content::SpeechInputResult& result) = 0;
     virtual void DidCompleteRecording(int caller_id) = 0;
     virtual void DidCompleteRecognition(int caller_id) = 0;
 
@@ skipping 38 matching lines @@
       const std::string& language,
       const std::string& grammar,
       const std::string& origin_url,
       net::URLRequestContextGetter* context_getter,
       content::SpeechInputPreferences* speech_input_prefs,
       AudioManager* audio_manager);
   virtual void CancelRecognition(int caller_id);
   virtual void CancelAllRequestsWithDelegate(Delegate* delegate);
   virtual void StopRecording(int caller_id);
 
-  // SpeechRecognizerDelegate methods.
+  // Overridden from content::SpeechRecognizerDelegate:
   virtual void DidStartReceivingAudio(int caller_id) OVERRIDE;
   virtual void SetRecognitionResult(
       int caller_id,
       const content::SpeechInputResult& result) OVERRIDE;
   virtual void DidCompleteRecording(int caller_id) OVERRIDE;
   virtual void DidCompleteRecognition(int caller_id) OVERRIDE;
   virtual void DidStartReceivingSpeech(int caller_id) OVERRIDE;
   virtual void DidStopReceivingSpeech(int caller_id) OVERRIDE;
 
   virtual void OnRecognizerError(int caller_id,
@@ skipping 78 matching lines @@
 
 // This typedef is to workaround the issue with certain versions of
 // Visual Studio where it gets confused between multiple Delegate
 // classes and gives a C2500 error. (I saw this error on the try bots -
 // the workaround was not needed for my machine).
 typedef SpeechInputManager::Delegate SpeechInputManagerDelegate;
 
 }  // namespace speech_input
 
 #endif  // CONTENT_BROWSER_SPEECH_SPEECH_INPUT_MANAGER_H_