Revert 130180 - Move media/audio files into media namespace

media/audio/audio_output_dispatcher.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.
 
 // AudioOutputDispatcher is a single-threaded class that dispatches creation and
 // deletion of audio output streams. AudioOutputProxy objects use this class to
 // allocate and recycle actual audio output streams. When playback is started,
 // the proxy calls StreamStarted() to get an output stream that it uses to play
 // audio. When playback is stopped, the proxy returns the stream back to the
 // dispatcher by calling StreamStopped().
@@ skipping 14 matching lines @@
 #include <vector>
 #include <list>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/timer.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_parameters.h"
 
+class AudioOutputStream;
 class MessageLoop;
 
-namespace media {
-
-class AudioOutputStream;
-
 class MEDIA_EXPORT AudioOutputDispatcher
     : public base::RefCountedThreadSafe<AudioOutputDispatcher> {
  public:
   // |close_delay_ms| specifies delay after the stream is paused until
   // the audio device is closed.
   AudioOutputDispatcher(AudioManager* audio_manager,
                         const AudioParameters& params,
                         base::TimeDelta close_delay);
   ~AudioOutputDispatcher();
 
@@ skipping 52 matching lines @@
   AudioOutputStreamList idle_streams_;
   AudioOutputStreamList pausing_streams_;
 
   // Used to post delayed tasks to ourselves that we cancel inside Shutdown().
   base::WeakPtrFactory<AudioOutputDispatcher> weak_this_;
   base::DelayTimer<AudioOutputDispatcher> close_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioOutputDispatcher);
 };
 
-}  // namespace media
-
 #endif  // MEDIA_AUDIO_AUDIO_OUTPUT_DISPATCHER_H_