Revert 130180 - Move media/audio files into media namespace

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_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/browser_process_sub_thread.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
+class AudioManager;
 class BrowserOnlineStateObserver;
 class CommandLine;
 class HighResolutionTimerManager;
 class MessageLoop;
 class SystemMessageWindowWin;
 
 namespace base {
 class SystemMonitor;
 }
 
-namespace media {
-class AudioManager;
-}
-
 namespace net {
 class NetworkChangeNotifier;
 }
 
 namespace content {
 
 class BrowserMainParts;
 class BrowserShutdownImpl;
 class BrowserThreadImpl;
 struct MainFunctionParams;
@@ skipping 21 matching lines @@
   // 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 AudioManager* GetAudioManager();
 
  private:
   // For ShutdownThreadsAndCleanUp.
   friend class BrowserShutdownImpl;
 
   void InitializeMainThread();
 
   // Called right after the browser threads have been started.
   void BrowserThreadsStarted();
 
   void MainMessageLoopRun();
 
   // Members initialized on construction ---------------------------------------
   const content::MainFunctionParams& parameters_;
   const CommandLine& parsed_command_line_;
   int result_code_;
 
   // Members initialized in |MainMessageLoopStart()| ---------------------------
   scoped_ptr<MessageLoop> main_message_loop_;
   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)
   scoped_ptr<SystemMessageWindowWin> system_message_window_;
 #elif defined(OS_LINUX)
   scoped_refptr<MediaDeviceNotificationsLinux>
       media_device_notifications_linux_;
 #endif
 
   // Destroy parts_ before main_message_loop_ (required) and before other
@@ skipping 19 matching lines @@
 #if defined(OS_WIN)
   ui::ScopedOleInitializer ole_initializer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_