Move media/audio files into media namespace (relanding)

media/audio/android/audio_track_output_stub_android.cc

Index: media/audio/android/audio_track_output_stub_android.cc
diff --git a/media/audio/android/audio_track_output_stub_android.cc b/media/audio/android/audio_track_output_stub_android.cc
index 5171591f70fc90a5b3486d89dbd5519203fe470f..ab4f9ba78e56048bc1564f60549a61568d869c18 100644
--- a/media/audio/android/audio_track_output_stub_android.cc
+++ b/media/audio/android/audio_track_output_stub_android.cc
@@ -1,9 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/android/audio_track_output_android.h"
 
+namespace media {
+
 // This file was added because there is no Java environment in
 // upstream yet, audio_track_output_android.cc should be used in
 // downstream.
@@ -14,3 +16,5 @@ AudioOutputStream* AudioTrackOutputStream::MakeStream(
     const AudioParameters& params) {
   return NULL;
 }
+
+}  // namespace media