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

chrome/browser/browser_process_impl.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 "chrome/browser/browser_process_impl.h"
 
 #include <map>
 #include <set>
 #include <vector>
 
@@ skipping 58 matching lines @@
 #include "chrome/common/url_constants.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "content/browser/download/mhtml_generation_manager.h"
 #include "content/browser/net/browser_online_state_observer.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/render_process_host.h"
-#include "media/audio/audio_manager.h"
 #include "net/socket/client_socket_pool_manager.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_WIN)
 #include "ui/views/focus/view_storage.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/chrome_browser_main_mac.h"
 #endif
@@ skipping 537 matching lines @@
   // either.
   return NULL;
 #else
   if (!crl_set_fetcher_.get()) {
     crl_set_fetcher_ = new CRLSetFetcher();
   }
   return crl_set_fetcher_.get();
 #endif
 }
 
-AudioManager* BrowserProcessImpl::audio_manager() {
-  DCHECK(CalledOnValidThread());
-  if (!audio_manager_.get())
-    audio_manager_.reset(AudioManager::Create());
-
-  return audio_manager_.get();
-}
-
 void BrowserProcessImpl::ResourceDispatcherHostCreated() {
   // UserScriptListener will delete itself.
   ResourceDispatcherHost* rdh = ResourceDispatcherHost::Get();
   rdh->AddResourceQueueDelegate(new UserScriptListener());
 
   resource_dispatcher_host_delegate_.reset(
       new ChromeResourceDispatcherHostDelegate(rdh, prerender_tracker()));
   rdh->set_delegate(resource_dispatcher_host_delegate_.get());
 
   pref_change_registrar_.Add(prefs::kAllowCrossOriginAuthPrompt, this);
@@ skipping 242 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartBackgroundInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)