Revert 130180 - Move media/audio files into media namespace

media/audio/audio_output_proxy.cc

 // 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.
 
 #include "media/audio/audio_output_proxy.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_output_dispatcher.h"
 
-namespace media {
-
 AudioOutputProxy::AudioOutputProxy(AudioOutputDispatcher* dispatcher)
     : dispatcher_(dispatcher),
       state_(kCreated),
       physical_stream_(NULL),
       volume_(1.0) {
 }
 
 AudioOutputProxy::~AudioOutputProxy() {
   DCHECK(CalledOnValidThread());
   DCHECK(state_ == kCreated || state_ == kClosed);
@@ skipping 64 matching lines @@
     dispatcher_->StreamClosed();
 
   state_ = kClosed;
 
   // Delete the object now like is done in the Close() implementation of
   // physical stream objects.  If we delete the object via DeleteSoon, we
   // unnecessarily complicate the Shutdown procedure of the
   // dispatcher+audio manager.
   delete this;
 }
-
-}  // namespace media