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

content/browser/browser_main_loop.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_BROWSER_MAIN_LOOP_H_
 #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/browser_process_sub_thread.h"
@@ skipping 29 matching lines @@
 struct MainFunctionParams;
 
 #if defined(OS_LINUX)
 class DeviceMonitorLinux;
 #elif defined(OS_MACOSX)
 class DeviceMonitorMac;
 #endif
 
 // Implements the main browser loop stages called from BrowserMainRunner.
 // See comments in browser_main_parts.h for additional info.
-// All functions are to be called only on the UI thread unless otherwise noted.
 class BrowserMainLoop {
  public:
-  class MemoryObserver;
+  // Returns the current instance. This is used to get access to the getters
+  // that return objects which are owned by this class.
+  static BrowserMainLoop* GetInstance();
+
   explicit BrowserMainLoop(const MainFunctionParams& parameters);
   virtual ~BrowserMainLoop();
 
   void Init();
 
   void EarlyInitialization();
   void InitializeToolkit();
   void MainMessageLoopStart();
 
   // Create all secondary threads.
   void CreateThreads();
 
   // Perform the default message loop run logic.
   void RunMainMessageLoopParts();
 
   // Performs the shutdown sequence, starting with PostMainMessageLoopRun
   // through stopping threads to PostDestroyThreads.
   void ShutdownThreadsAndCleanUp();
 
   int GetResultCode() const { return result_code_; }
 
-  // Can be called on any thread.
-  static media::AudioManager* GetAudioManager();
-  static AudioMirroringManager* GetAudioMirroringManager();
-  static MediaStreamManager* GetMediaStreamManager();
+  media::AudioManager* audio_manager() const { return audio_manager_.get(); }
+  AudioMirroringManager* audio_mirroring_manager() const {
+    return audio_mirroring_manager_.get();
+  }
+  MediaStreamManager* media_stream_manager() const {
+    return media_stream_manager_.get();
+  }
 
  private:
+  class MemoryObserver;
   // For ShutdownThreadsAndCleanUp.
   friend class BrowserShutdownImpl;
 
   void InitializeMainThread();
 
   // Called right after the browser threads have been started.
   void BrowserThreadsStarted();
 
   void MainMessageLoopRun();
 
@@ skipping 44 matching lines @@
   scoped_ptr<BrowserProcessSubThread> cache_thread_;
   scoped_ptr<BrowserProcessSubThread> io_thread_;
   scoped_ptr<MemoryObserver> memory_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_