Moved instantiation of SpeechRecognitionManager inside browser_main_loop, instead of Singleton.

content/browser/speech/input_tag_speech_dispatcher_host.h

Index: content/browser/speech/input_tag_speech_dispatcher_host.h
diff --git a/content/browser/speech/input_tag_speech_dispatcher_host.h b/content/browser/speech/input_tag_speech_dispatcher_host.h
index b98d9e5f580158f7918d82838579372d41931af4..637ca122884742ea4bd63c17e90b679885392f39 100644
--- a/content/browser/speech/input_tag_speech_dispatcher_host.h
+++ b/content/browser/speech/input_tag_speech_dispatcher_host.h
@@ -15,14 +15,13 @@
 struct InputTagSpeechHostMsg_StartRecognition_Params;
 
 namespace content {
+class SpeechRecognitionManager;
 class SpeechRecognitionPreferences;
 struct SpeechRecognitionResult;
 }
 
 namespace speech {
 
-class SpeechRecognitionManagerImpl;
-
 // InputTagSpeechDispatcherHost is a delegate for Speech API messages used by
 // RenderMessageFilter. Basically it acts as a proxy, relaying the events coming
 // from the SpeechRecognitionManager to IPC messages (and vice versa).
@@ -56,7 +55,7 @@ class CONTENT_EXPORT InputTagSpeechDispatcherHost
                                  bool* message_was_ok) OVERRIDE;
 
   // Singleton manager setter useful for tests.
-  static void set_manager(SpeechRecognitionManagerImpl* manager);
+  static void SetManagerForTests(content::SpeechRecognitionManager* manager);
 
  private:
   virtual ~InputTagSpeechDispatcherHost();
@@ -68,7 +67,7 @@ class CONTENT_EXPORT InputTagSpeechDispatcherHost
 
   // Returns the speech recognition manager to forward events to, creating one
   // if needed.
-  SpeechRecognitionManagerImpl* manager();
+  content::SpeechRecognitionManager* manager();
 
   int render_process_id_;
   bool may_have_pending_requests_;  // Set if we received any speech IPC request
@@ -76,7 +75,7 @@ class CONTENT_EXPORT InputTagSpeechDispatcherHost
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
   scoped_refptr<content::SpeechRecognitionPreferences> recognition_preferences_;
 
-  static SpeechRecognitionManagerImpl* manager_;
+  static content::SpeechRecognitionManager* manager_for_tests_;
 
   DISALLOW_COPY_AND_ASSIGN(InputTagSpeechDispatcherHost);
 };