Revert 121810 - Move SpeechRecognizer delegate into its own header file and put it in the content...

chrome/browser/speech/speech_input_extension_manager.h

Index: chrome/browser/speech/speech_input_extension_manager.h
===================================================================
--- chrome/browser/speech/speech_input_extension_manager.h	(revision 121818)
+++ chrome/browser/speech/speech_input_extension_manager.h	(working copy)
@@ -6,14 +6,10 @@
 #define CHROME_BROWSER_SPEECH_SPEECH_INPUT_EXTENSION_MANAGER_H_
 #pragma once
 
-#include <string>
-
-#include "base/callback_forward.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
+#include "content/browser/speech/speech_recognizer.h"
 #include "content/public/browser/notification_observer.h"
-#include "content/public/browser/speech_recognizer_delegate.h"
+#include <string>
 
 class Extension;
 class Profile;
@@ -28,10 +24,6 @@
 class URLRequestContextGetter;
 }
 
-namespace speech_input {
-class SpeechRecognizer;
-}
-
 // Used for API tests.
 class SpeechInputExtensionInterface {
  public:
@@ -40,7 +32,7 @@
 
   // Called from the IO thread.
   virtual void StartRecording(
-      content::SpeechRecognizerDelegate* delegate,
+      speech_input::SpeechRecognizerDelegate* delegate,
       net::URLRequestContextGetter* context_getter,
       content::ResourceContext* resource_context,
       int caller_id,
@@ -65,7 +57,7 @@
 // associated to the given profile.
 class SpeechInputExtensionManager
     : public base::RefCountedThreadSafe<SpeechInputExtensionManager>,
-      public content::SpeechRecognizerDelegate,
+      public speech_input::SpeechRecognizerDelegate,
       public content::NotificationObserver,
       private SpeechInputExtensionInterface {
  public:
@@ -155,7 +147,7 @@
   virtual bool HasValidRecognizer() OVERRIDE;
 
   virtual void StartRecording(
-      content::SpeechRecognizerDelegate* delegate,
+      speech_input::SpeechRecognizerDelegate* delegate,
       net::URLRequestContextGetter* context_getter,
       content::ResourceContext* resource_context,
       int caller_id,