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

content/browser/browser_main_loop.cc

 // 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.
 
 #include "content/browser/browser_main_loop.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/hi_res_timer_manager.h"
@@ skipping 258 matching lines @@
     size_t private_bytes;
     process_metrics->GetMemoryBytes(&private_bytes, NULL);
     HISTOGRAM_MEMORY_KB("Memory.BrowserUsed", private_bytes >> 10);
 #endif
   }
  private:
   DISALLOW_COPY_AND_ASSIGN(MemoryObserver);
 };
 
 
-// static
-media::AudioManager* BrowserMainLoop::GetAudioManager() {
-  return g_current_browser_main_loop->audio_manager_.get();
+// BrowserMainLoop construction / destruction =============================
+
+BrowserMainLoop* BrowserMainLoop::GetInstance() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  return g_current_browser_main_loop;
 }
 
-// static
-AudioMirroringManager* BrowserMainLoop::GetAudioMirroringManager() {
-  return g_current_browser_main_loop->audio_mirroring_manager_.get();
-}
-
-// static
-MediaStreamManager* BrowserMainLoop::GetMediaStreamManager() {
-  return g_current_browser_main_loop->media_stream_manager_.get();
-}
-// BrowserMainLoop construction / destruction =============================
-
 BrowserMainLoop::BrowserMainLoop(const MainFunctionParams& parameters)
     : parameters_(parameters),
       parsed_command_line_(parameters.command_line),
       result_code_(RESULT_CODE_NORMAL_EXIT) {
   DCHECK(!g_current_browser_main_loop);
   g_current_browser_main_loop = this;
 }
 
 BrowserMainLoop::~BrowserMainLoop() {
   DCHECK_EQ(this, g_current_browser_main_loop);
@@ skipping 516 matching lines @@
     media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get()));
   }
 
   // Initialize the GpuDataManager before we set up the MessageLoops because
   // otherwise we'll trigger the assertion about doing IO on the UI thread.
   GpuDataManagerImpl::GetInstance()->Initialize();
 
   {
     TRACE_EVENT0("startup",
       "BrowserMainLoop::BrowserThreadsStarted:InitSpeechRecognition");
-    speech_recognition_manager_.reset(new SpeechRecognitionManagerImpl());
+    speech_recognition_manager_.reset(new SpeechRecognitionManagerImpl(
+        audio_manager_.get(), media_stream_manager_.get()));
   }
 
   // Alert the clipboard class to which threads are allowed to access the
   // clipboard:
   std::vector<base::PlatformThreadId> allowed_clipboard_threads;
   // The current thread is the UI thread.
   allowed_clipboard_threads.push_back(base::PlatformThread::CurrentId());
 #if defined(OS_WIN)
   // On Windows, clipboards are also used on the File or IO threads.
   allowed_clipboard_threads.push_back(file_thread_->thread_id());
@@ skipping 75 matching lines @@
   if (parameters_.ui_task)
     base::MessageLoopForUI::current()->PostTask(FROM_HERE,
                                                 *parameters_.ui_task);
 
   base::RunLoop run_loop;
   run_loop.Run();
 #endif
 }
 
 }  // namespace content