Moved instantiation of SpeechRecognitionManager inside browser_main_loop, instead of Singleton.

content/browser/speech/speech_recognition_manager_impl.h

Index: content/browser/speech/speech_recognition_manager_impl.h
diff --git a/content/browser/speech/speech_recognition_manager_impl.h b/content/browser/speech/speech_recognition_manager_impl.h
index 6088a5a18228bcb95d0c76dc89c3ab8aff43f7fe..125f1bcae94fdb5dcbcc8514698391a7827f421a 100644
--- a/content/browser/speech/speech_recognition_manager_impl.h
+++ b/content/browser/speech/speech_recognition_manager_impl.h
@@ -51,8 +51,13 @@ class CONTENT_EXPORT SpeechRecognitionManagerImpl :
     public NON_EXPORTED_BASE(content::SpeechRecognitionManager),
     public content::SpeechRecognitionEventListener {
  public:
+  // Returns the current SpeechRecognitionManagerImpl. May return NULL if it
+  // hasn't been created yet.
   static SpeechRecognitionManagerImpl* GetInstance();
 
+  SpeechRecognitionManagerImpl();

[hans, 2012/05/15 15:32:31]

hmm, it feels weird having a public constructor when this is effectively going
to be a singleton?

[Primiano Tucci (use gerrit), 2012/05/15 16:04:03]

Hmm, the singleton was removed because it had a too large lifetime. Now it
behaves effectively as a singleton, but it lifecycle is managed by
BrowserMainLoop.
Made it protected and friend of BrowserMainLoop, perhaps it might look better.

+  virtual ~SpeechRecognitionManagerImpl();
+
   // SpeechRecognitionManager implementation.
   virtual int CreateSession(
       const content::SpeechRecognitionSessionConfig& config) OVERRIDE;
@@ -89,12 +94,6 @@ class CONTENT_EXPORT SpeechRecognitionManagerImpl :
   virtual void OnAudioLevelsChange(int session_id, float volume,
                                    float noise_volume) OVERRIDE;
 
- protected:
-  // Private constructor to enforce singleton.
-  friend struct DefaultSingletonTraits<SpeechRecognitionManagerImpl>;
-  SpeechRecognitionManagerImpl();
-  virtual ~SpeechRecognitionManagerImpl();
-
  private:
   // Data types for the internal Finite State Machine (FSM).
   enum FSMState {
@@ -158,7 +157,7 @@ class CONTENT_EXPORT SpeechRecognitionManagerImpl :
   int session_id_capturing_audio_;
   int last_session_id_;
   bool is_dispatching_event_;
-  content::SpeechRecognitionManagerDelegate* delegate_;
+  scoped_ptr<content::SpeechRecognitionManagerDelegate> delegate_;
 };
 
 }  // namespace speech