Remove GetAudioManager and GetMediaStreamManager from ResourceContext. The reason is the content mo…

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/logging.h"
@@ skipping 14 matching lines @@
 #include "content/common/hi_res_timer_manager.h"
 #include "content/common/sandbox_policy.h"
 #include "content/public/browser/browser_main_parts.h"
 #include "content/public/browser/browser_shutdown.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/common/result_codes.h"
 #include "crypto/nss_util.h"
+#include "media/audio/audio_manager.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/ssl_config_service.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/tcp_client_socket.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <commctrl.h>
 #include <ole2.h>
 #include <shellapi.h>
@@ skipping 117 matching lines @@
                       NULL);
   }
 }
 #endif
 
 }  // namespace
 
 namespace content {
 
 // The currently-running BrowserMainLoop.  There can be one or zero.
-// This is stored to enable immediate shutdown when needed.
-BrowserMainLoop* current_browser_main_loop = NULL;
+BrowserMainLoop* g_current_browser_main_loop = NULL;
 
 // This is just to be able to keep ShutdownThreadsAndCleanUp out of
 // the public interface of BrowserMainLoop.
 class BrowserShutdownImpl {
  public:
   static void ImmediateShutdownAndExitProcess() {
-    DCHECK(current_browser_main_loop);
-    current_browser_main_loop->ShutdownThreadsAndCleanUp();
+    DCHECK(g_current_browser_main_loop);
+    g_current_browser_main_loop->ShutdownThreadsAndCleanUp();
 
 #if defined(OS_WIN)
     // At this point the message loop is still running yet we've shut everything
     // down. If any messages are processed we'll likely crash. Exit now.
     ExitProcess(content::RESULT_CODE_NORMAL_EXIT);
 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
     _exit(content::RESULT_CODE_NORMAL_EXIT);
 #else
     NOTIMPLEMENTED();
 #endif
   }
 };
 
 void ImmediateShutdownAndExitProcess() {
   BrowserShutdownImpl::ImmediateShutdownAndExitProcess();
 }
 
+// static
+AudioManager* BrowserMainLoop::GetAudioManager() {
+  return g_current_browser_main_loop->audio_manager_.get();
+}
+
 // BrowserMainLoop construction / destructione =============================
 
 BrowserMainLoop::BrowserMainLoop(const content::MainFunctionParams& parameters)
     : parameters_(parameters),
       parsed_command_line_(parameters.command_line),
       result_code_(content::RESULT_CODE_NORMAL_EXIT) {
-  DCHECK(!current_browser_main_loop);
-  current_browser_main_loop = this;
+  DCHECK(!g_current_browser_main_loop);
+  g_current_browser_main_loop = this;
 #if defined(OS_WIN)
   OleInitialize(NULL);
 #endif
 }
 
 BrowserMainLoop::~BrowserMainLoop() {
-  DCHECK_EQ(this, current_browser_main_loop);
-  current_browser_main_loop = NULL;
+  DCHECK_EQ(this, g_current_browser_main_loop);
+  g_current_browser_main_loop = NULL;
 #if defined(OS_WIN)
   OleUninitialize();
 #endif
 }
 
 void BrowserMainLoop::Init() {
   parts_.reset(
       GetContentClient()->browser()->CreateBrowserMainParts(parameters_));
 }
 
@@ skipping 84 matching lines @@
   InitializeMainThread();
 
   // Start tracing to a file if needed.
   if (base::debug::TraceLog::GetInstance()->IsEnabled())
     TraceController::GetInstance()->InitStartupTracing(parsed_command_line_);
 
   system_monitor_.reset(new base::SystemMonitor);
   hi_res_timer_manager_.reset(new HighResolutionTimerManager);
 
   network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
+  audio_manager_.reset(AudioManager::Create());
 
 #if defined(OS_WIN)
   system_message_window_.reset(new SystemMessageWindowWin);
 #endif
 
   // Prior to any processing happening on the io thread, we create the
   // plugin service as it is predominantly used from the io thread,
   // but must be created on the main thread. The service ctor is
   // inexpensive and does not invoke the io_thread() accessor.
   PluginService::GetInstance()->Init();
@@ skipping 285 matching lines @@
     MessageLoopForUI::current()->PostTask(FROM_HERE, *parameters_.ui_task);
 
 #if defined(OS_MACOSX)
   MessageLoopForUI::current()->Run();
 #else
   MessageLoopForUI::current()->RunWithDispatcher(NULL);
 #endif
 }
 
 }  // namespace content