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

content/browser/speech/speech_recognition_manager_impl.cc

 // Copyright (c) 2013 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.
 
 #include "content/browser/speech/speech_recognition_manager_impl.h"
 
 #include "base/bind.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h"
@@ skipping 19 matching lines @@
 using base::Callback;
 
 namespace content {
 
 SpeechRecognitionManager* SpeechRecognitionManager::manager_for_tests_;
 
 namespace {
 
 SpeechRecognitionManagerImpl* g_speech_recognition_manager_impl;
 
-void ShowAudioInputSettingsOnFileThread() {
+void ShowAudioInputSettingsOnFileThread(media::AudioManager* audio_manager) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  BrowserMainLoop::GetAudioManager()->ShowAudioInputSettings();
+  audio_manager->ShowAudioInputSettings();
 }
 
 }  // namespace
 
 SpeechRecognitionManager* SpeechRecognitionManager::GetInstance() {
   if (manager_for_tests_)
     return manager_for_tests_;
   return SpeechRecognitionManagerImpl::GetInstance();
 }
 
 void SpeechRecognitionManager::SetManagerForTests(
     SpeechRecognitionManager* manager) {
   manager_for_tests_ = manager;
 }
 
 SpeechRecognitionManagerImpl* SpeechRecognitionManagerImpl::GetInstance() {
   return g_speech_recognition_manager_impl;
 }
 
-SpeechRecognitionManagerImpl::SpeechRecognitionManagerImpl()
-    : primary_session_id_(kSessionIDInvalid),
+SpeechRecognitionManagerImpl::SpeechRecognitionManagerImpl(
+      media::AudioManager* audio_manager,
+      MediaStreamManager* media_stream_manager)
+    : audio_manager_(audio_manager),
+      media_stream_manager_(media_stream_manager),
+      primary_session_id_(kSessionIDInvalid),
       last_session_id_(kSessionIDInvalid),
       is_dispatching_event_(false),
       delegate_(GetContentClient()->browser()->
                     GetSpeechRecognitionManagerDelegate()),
       weak_factory_(this) {
   DCHECK(!g_speech_recognition_manager_impl);
   g_speech_recognition_manager_impl = this;
 }
 
 SpeechRecognitionManagerImpl::~SpeechRecognitionManagerImpl() {
@@ skipping 102 matching lines @@
                                                               bool ask_user,
                                                               bool is_allowed) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!SessionExists(session_id))
     return;
 
   if (ask_user) {
     SessionsTable::iterator iter = sessions_.find(session_id);
     DCHECK(iter != sessions_.end());
     SpeechRecognitionSessionContext& context = iter->second->context;
-    context.label =
-        BrowserMainLoop::GetMediaStreamManager()->MakeMediaAccessRequest(
-            context.render_process_id,
-            context.render_view_id,
-            StreamOptions(MEDIA_DEVICE_AUDIO_CAPTURE, MEDIA_NO_SERVICE),
-            GURL(context.context_name),
-            base::Bind(
-                &SpeechRecognitionManagerImpl::MediaRequestPermissionCallback,
-                weak_factory_.GetWeakPtr(), session_id));
+    context.label = media_stream_manager_->MakeMediaAccessRequest(
+        context.render_process_id,
+        context.render_view_id,
+        StreamOptions(MEDIA_DEVICE_AUDIO_CAPTURE, MEDIA_NO_SERVICE),
+        GURL(context.context_name),
+        base::Bind(
+            &SpeechRecognitionManagerImpl::MediaRequestPermissionCallback,
+            weak_factory_.GetWeakPtr(), session_id));
     return;
   }
 
   if (is_allowed) {
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&SpeechRecognitionManagerImpl::DispatchEvent,
                    weak_factory_.GetWeakPtr(),
                    session_id,
                    EVENT_START));
@@ skipping 430 matching lines @@
 SpeechRecognitionManagerImpl::GetDelegateListener() const {
   return delegate_.get() ? delegate_->GetEventListener() : NULL;
 }
 
 const SpeechRecognitionSessionConfig&
 SpeechRecognitionManagerImpl::GetSessionConfig(int session_id) const {
   return GetSession(session_id)->config;
 }
 
 bool SpeechRecognitionManagerImpl::HasAudioInputDevices() {
-  return BrowserMainLoop::GetAudioManager()->HasAudioInputDevices();
+  return audio_manager_->HasAudioInputDevices();
 }
 
 string16 SpeechRecognitionManagerImpl::GetAudioInputDeviceModel() {
-  return BrowserMainLoop::GetAudioManager()->GetAudioInputDeviceModel();
+  return audio_manager_->GetAudioInputDeviceModel();
 }
 
 void SpeechRecognitionManagerImpl::ShowAudioInputSettings() {
   // Since AudioManager::ShowAudioInputSettings can potentially launch external
   // processes, do that in the FILE thread to not block the calling threads.
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
-                          base::Bind(&ShowAudioInputSettingsOnFileThread));
+                          base::Bind(&ShowAudioInputSettingsOnFileThread,
+                                     audio_manager_));
 }
 
 SpeechRecognitionManagerImpl::Session::Session()
   : id(kSessionIDInvalid),
     listener_is_active(true) {
 }
 
 SpeechRecognitionManagerImpl::Session::~Session() {
 }
 
 }  // namespace content