Moved instantiation of SpeechRecognitionManager inside browser_main_loop, instead of Singleton.

content/browser/speech/speech_recognition_manager_impl.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_RECOGNITION_MANAGER_IMPL_H_
 #define CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_MANAGER_IMPL_H_
 #pragma once
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/singleton.h"

[jam, 2012/05/15 16:38:31]

nit: not needed anymore

 #include "content/public/browser/speech_recognition_event_listener.h"
 #include "content/public/browser/speech_recognition_manager.h"
 #include "content/public/browser/speech_recognition_session_config.h"
 #include "content/public/browser/speech_recognition_session_context.h"
 #include "content/public/common/speech_recognition_error.h"
 
 namespace content {
+class BrowserMainLoop;
 class SpeechRecognitionManagerDelegate;
 }
 
 namespace speech {
 
 class SpeechRecognizerImpl;
 
 // This is the manager for speech recognition. It is a singleton instance in
 // the browser process and can serve several requests. Each recognition request
 // corresponds to a session, initiated via |CreateSession|.
@@ skipping 11 matching lines @@
 //  - Handles the instantiation of SpeechRecognitionEngine objects when
 //    requested by SpeechRecognitionSessions.
 //  - Relays recognition results/status/error events of each session to the
 //    corresponding listener (demuxing on the base of their session_id).
 //  - Relays also recognition results/status/error events of every session to
 //    the catch-all snoop listener (optionally) provided by the delegate.
 class CONTENT_EXPORT SpeechRecognitionManagerImpl :
     public NON_EXPORTED_BASE(content::SpeechRecognitionManager),
     public content::SpeechRecognitionEventListener {
  public:
+  // Returns the current SpeechRecognitionManagerImpl. Can be called only after
+  // the RecognitionMnager has been created (by BrowserMainLoop).
   static SpeechRecognitionManagerImpl* GetInstance();
 
   // SpeechRecognitionManager implementation.
   virtual int CreateSession(
       const content::SpeechRecognitionSessionConfig& config) OVERRIDE;
   virtual void StartSession(int session_id) OVERRIDE;
   virtual void AbortSession(int session_id) OVERRIDE;
   virtual void AbortAllSessionsForListener(
         content::SpeechRecognitionEventListener* listener) OVERRIDE;
   virtual void StopAudioCaptureForSession(int session_id) OVERRIDE;
@@ skipping 19 matching lines @@
   virtual void OnAudioEnd(int session_id) OVERRIDE;
   virtual void OnRecognitionEnd(int session_id) OVERRIDE;
   virtual void OnRecognitionResult(
       int session_id, const content::SpeechRecognitionResult& result) OVERRIDE;
   virtual void OnRecognitionError(
       int session_id, const content::SpeechRecognitionError& error) OVERRIDE;
   virtual void OnAudioLevelsChange(int session_id, float volume,
                                    float noise_volume) OVERRIDE;
 
  protected:
-  // Private constructor to enforce singleton.
-  friend struct DefaultSingletonTraits<SpeechRecognitionManagerImpl>;
+  // BrowserMainLoop is the only one allowed to istantiate and free us.
+  friend class content::BrowserMainLoop;
+  friend class scoped_ptr<SpeechRecognitionManagerImpl>;  // Needed for dtor.
   SpeechRecognitionManagerImpl();
   virtual ~SpeechRecognitionManagerImpl();
 
  private:
   // Data types for the internal Finite State Machine (FSM).
   enum FSMState {
     SESSION_STATE_IDLE = 0,
     SESSION_STATE_CAPTURING_AUDIO,
     SESSION_STATE_WAITING_FOR_RESULT,
     SESSION_STATE_MAX_VALUE = SESSION_STATE_WAITING_FOR_RESULT
@@ skipping 46 matching lines @@
   const Session& GetSession(int session_id) const;
   content::SpeechRecognitionEventListener* GetListener(int session_id) const;
   content::SpeechRecognitionEventListener* GetDelegateListener() const;
   int GetNextSessionID();
 
   typedef std::map<int, Session> SessionsTable;
   SessionsTable sessions_;
   int session_id_capturing_audio_;
   int last_session_id_;
   bool is_dispatching_event_;
-  content::SpeechRecognitionManagerDelegate* delegate_;
+  scoped_ptr<content::SpeechRecognitionManagerDelegate> delegate_;
 };
 
 }  // namespace speech
 
 #endif  // CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_MANAGER_IMPL_H_