Revert 130180 - Move media/audio files into media namespace

BUG=115187
TEST=compiles and runs without breaking audio tag; media_unittests, content_unittests

Review URL: https://chromiumcodereview.appspot.com/9805001

TBR=vrk@google.com
Review URL: https://chromiumcodereview.appspot.com/9965076

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130182 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 6 deletions

diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index f43e6eb..138d11e 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -14,6 +14,7 @@
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
+class AudioManager;
 class BrowserOnlineStateObserver;
 class CommandLine;
 class HighResolutionTimerManager;
@@ -24,10 +25,6 @@ namespace base {
 class SystemMonitor;
 }
 
-namespace media {
-class AudioManager;
-}
-
 namespace net {
 class NetworkChangeNotifier;
 }
@@ -69,7 +66,7 @@ class BrowserMainLoop {
   int GetResultCode() const { return result_code_; }
 
   // Can be called on any thread.
-  static media::AudioManager* GetAudioManager();
+  static AudioManager* GetAudioManager();
 
  private:
   // For ShutdownThreadsAndCleanUp.
@@ -92,7 +89,7 @@ class BrowserMainLoop {
   scoped_ptr<base::SystemMonitor> system_monitor_;
   scoped_ptr<HighResolutionTimerManager> hi_res_timer_manager_;
   scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
-  scoped_ptr<media::AudioManager> audio_manager_;
+  scoped_ptr<AudioManager> audio_manager_;
   // Per-process listener for online state changes.
   scoped_ptr<BrowserOnlineStateObserver> online_state_observer_;
 #if defined(OS_WIN)