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 AudioOutputProxyTest;
+class MessageLoop;
+
+namespace media {
+
 class AudioOutputStream;
-class MessageLoop;
 
 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 16 matching lines @@
   // Ownership of the |stream| is passed to the dispatcher.
   void StreamStopped(AudioOutputStream* stream);
 
   // Called by AudioOutputProxy when the stream is closed.
   void StreamClosed();
 
   // Called on the audio thread when the AudioManager is shutting down.
   void Shutdown();
 
  private:
-  friend class AudioOutputProxyTest;
+  // XXX(vrk): See comment in AudioOutputProxyTest.

[scherkus (not reviewing), 2012/03/21 08:50:27]

???

[vrk (LEFT CHROMIUM), 2012/03/21 20:17:48]

Oh, I was just trying to explain why AudioOutputProxyTest was in the global
scope! Deleted now anyway!

+  friend class ::AudioOutputProxyTest;
 
   // Creates a new physical output stream, opens it and pushes to
   // |idle_streams_|.  Returns false if the stream couldn't be created or
   // opened.
   bool CreateAndOpenStream();
 
   // A task scheduled by StreamStarted(). Opens a new stream and puts
   // it in |idle_streams_|.
   void OpenTask();
 
@@ skipping 16 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_