Revert 130180 - Move media/audio files into media namespace

content/browser/renderer_host/media/audio_renderer_host.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.
 //
 // AudioRendererHost serves audio related requests from AudioRenderer which
 // lives inside the render process and provide access to audio hardware.
 //
 // This class is owned by BrowserRenderProcessHost, and instantiated on UI
 // thread, but all other operations and method calls happen on IO thread, so we
 // need to be extra careful about the lifetime of this object. AudioManager is a
@@ skipping 35 matching lines @@
 #include "base/message_loop_helpers.h"
 #include "base/process.h"
 #include "base/shared_memory.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/browser/browser_thread.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_output_controller.h"
 #include "media/audio/simple_sources.h"
 
+class AudioManager;
+class AudioParameters;
+
 namespace content {
 class MediaObserver;
 class ResourceContext;
 }  // namespace content
 
-namespace media {
-class AudioManager;
-class AudioParameters;
-}
-
 class CONTENT_EXPORT AudioRendererHost
     : public content::BrowserMessageFilter,
       public media::AudioOutputController::EventHandler {
  public:
   struct AudioEntry {
     AudioEntry();
     ~AudioEntry();
 
     // The AudioOutputController that manages the audio stream.
     scoped_refptr<media::AudioOutputController> controller;
 
     // The audio stream ID.
     int stream_id;
 
     // Shared memory for transmission of the audio data.
     base::SharedMemory shared_memory;
 
     // The synchronous reader to be used by the controller. We have the
     // ownership of the reader.
     scoped_ptr<media::AudioOutputController::SyncReader> reader;
 
     // Set to true after we called Close() for the controller.
     bool pending_close;
   };
 
   typedef std::map<int, AudioEntry*> AudioEntryMap;
 
   // Called from UI thread from the owner of this object.
-  AudioRendererHost(media::AudioManager* audio_manager,
+  AudioRendererHost(AudioManager* audio_manager,
                     content::MediaObserver* media_observer);
 
   // content::BrowserMessageFilter implementation.
   virtual void OnChannelClosing() OVERRIDE;
   virtual void OnDestruct() const OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message,
                                  bool* message_was_ok) OVERRIDE;
 
   // AudioOutputController::EventHandler implementations.
   virtual void OnCreated(media::AudioOutputController* controller) OVERRIDE;
@@ skipping 11 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(AudioRendererHostTest, MockStreamDataConversation);
 
   virtual ~AudioRendererHost();
 
   // Methods called on IO thread ----------------------------------------------
 
   // Audio related IPC message handlers.
   // Creates an audio output stream with the specified format. If this call is
   // successful this object would keep an internal entry of the stream for the
   // required properties.
-  void OnCreateStream(int stream_id, const media::AudioParameters& params);
+  void OnCreateStream(int stream_id, const AudioParameters& params);
 
   // Play the audio stream referenced by |stream_id|.
   void OnPlayStream(int stream_id);
 
   // Pause the audio stream referenced by |stream_id|.
   void OnPauseStream(int stream_id);
 
   // Discard all audio data in stream referenced by |stream_id|.
   void OnFlushStream(int stream_id);
 
@@ skipping 36 matching lines @@
   AudioEntry* LookupById(int stream_id);
 
   // Search for a AudioEntry having the reference to |controller|.
   // This method is used to look up an AudioEntry after a controller
   // event is received.
   AudioEntry* LookupByController(media::AudioOutputController* controller);
 
   // A map of stream IDs to audio sources.
   AudioEntryMap audio_entries_;
 
-  media::AudioManager* audio_manager_;
+  AudioManager* audio_manager_;
   content::MediaObserver* media_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererHost);
 };
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_RENDERER_HOST_H_