Minor cleanup to remove the static thread-safe methods on BrowserMainLoop. Initially I thought this…

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_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "content/browser/renderer_host/media/media_stream_requester.h"
 #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 media {
+class AudioManager;
+}
+
 namespace content {
 class BrowserMainLoop;
+class MediaStreamManager;
 class MediaStreamUIProxy;
 class SpeechRecognitionManagerDelegate;
 class SpeechRecognizer;
 
 // This is the manager for speech recognition. It is a single instance in
 // the browser process and can serve several requests. Each recognition request
 // corresponds to a session, initiated via |CreateSession|.
 //
 // In any moment, the manager has a single session known as the primary session,
 // |primary_session_id_|.
@@ skipping 52 matching lines @@
   virtual void OnRecognitionError(
       int session_id, const SpeechRecognitionError& error) OVERRIDE;
   virtual void OnAudioLevelsChange(int session_id, float volume,
                                    float noise_volume) OVERRIDE;
 
  protected:
   // BrowserMainLoop is the only one allowed to istantiate and free us.
   friend class BrowserMainLoop;
   // Needed for dtor.
   friend struct base::DefaultDeleter<SpeechRecognitionManagerImpl>;
-  SpeechRecognitionManagerImpl();
+  SpeechRecognitionManagerImpl(media::AudioManager* audio_manager,
+                               MediaStreamManager* media_stream_manager);
   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 51 matching lines @@
   void ResetCapturingSessionId(const Session& session);
   void SessionDelete(Session* session);
   void NotFeasible(const Session& session, FSMEvent event);
 
   bool SessionExists(int session_id) const;
   Session* GetSession(int session_id) const;
   SpeechRecognitionEventListener* GetListener(int session_id) const;
   SpeechRecognitionEventListener* GetDelegateListener() const;
   int GetNextSessionID();
 
+  media::AudioManager* audio_manager_;
+  MediaStreamManager* media_stream_manager_;
   typedef std::map<int, Session*> SessionsTable;
   SessionsTable sessions_;
   int primary_session_id_;
   int last_session_id_;
   bool is_dispatching_event_;
   scoped_ptr<SpeechRecognitionManagerDelegate> delegate_;
 
   // Used for posting asynchronous tasks (on the IO thread) without worrying
   // about this class being destroyed in the meanwhile (due to browser shutdown)
   // since tasks pending on a destroyed WeakPtr are automatically discarded.
   base::WeakPtrFactory<SpeechRecognitionManagerImpl> weak_factory_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_MANAGER_IMPL_H_