Revert 130180 - Move media/audio files into media namespace

media/audio/pulse/pulse_output.cc

Index: media/audio/pulse/pulse_output.cc
===================================================================
--- media/audio/pulse/pulse_output.cc	(revision 130181)
+++ media/audio/pulse/pulse_output.cc	(working copy)
@@ -1,4 +1,4 @@
-// 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.
 
@@ -16,8 +16,6 @@
 #include "media/base/data_buffer.h"
 #include "media/base/seekable_buffer.h"
 
-namespace media {
-
 static pa_sample_format_t BitsToPASampleFormat(int bits_per_sample) {
   switch (bits_per_sample) {
     // Unsupported sample formats shown for reference.  I am assuming we want
@@ -428,5 +426,3 @@
 
   return 0;
 }
-
-}  // namespace media
Property changes on: media/audio/pulse/pulse_output.cc
___________________________________________________________________
Deleted: svn:mergeinfo