Revert 130180 - Move media/audio files into media namespace

media/audio/mac/audio_output_mac.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 MEDIA_AUDIO_MAC_AUDIO_OUTPUT_MAC_H_
 #define MEDIA_AUDIO_MAC_AUDIO_OUTPUT_MAC_H_
 
 #include <AudioToolbox/AudioFormat.h>
 #include <AudioToolbox/AudioQueue.h>
 #include <AudioUnit/AudioUnit.h>
 
 #include "base/compiler_specific.h"
 #include "base/synchronization/lock.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 
-namespace media {
-
 class AudioManagerMac;
 
 // Implementation of AudioOuputStream for Mac OS X using the audio queue service
 // present in OS 10.5 and later. Audioqueue is the successor to the SoundManager
 // services but it is supported in 64 bits.
 class PCMQueueOutAudioOutputStream : public AudioOutputStream {
  public:
   // The ctor takes all the usual parameters, plus |manager| which is the
   // the audio manager who is creating this object.
   PCMQueueOutAudioOutputStream(AudioManagerMac* manager,
@@ skipping 63 matching lines @@
   // Number of channels in device layout.
   int num_core_channels_;
   // A flag to determine if swizzle is needed from source to device layouts.
   bool should_swizzle_;
   // A flag to determine if downmix is needed from source to device layouts.
   bool should_down_mix_;
 
   DISALLOW_COPY_AND_ASSIGN(PCMQueueOutAudioOutputStream);
 };
 
-}  // namespace media
-
 #endif  // MEDIA_AUDIO_MAC_AUDIO_OUTPUT_MAC_H_