Revert 130180 - Move media/audio files into media namespace

media/tools/player_x11/player_x11.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 <X11/XKBlib.h>
 #include <X11/Xlib.h>
 #include <signal.h>
 
 #include <iostream>  // NOLINT
 
@@ skipping 19 matching lines @@
 #include "media/filters/null_audio_renderer.h"
 #include "media/filters/video_renderer_base.h"
 #include "media/tools/player_x11/data_source_logger.h"
 #include "media/tools/player_x11/gl_video_renderer.h"
 #include "media/tools/player_x11/x11_video_renderer.h"
 
 static Display* g_display = NULL;
 static Window g_window = 0;
 static bool g_running = false;
 
-media::AudioManager* g_audio_manager = NULL;
+AudioManager* g_audio_manager = NULL;
 
 media::VideoRendererBase* g_video_renderer = NULL;
 
 scoped_refptr<media::FileDataSource> CreateFileDataSource(
     const std::string& file) {
   scoped_refptr<media::FileDataSource> file_data_source(
       new media::FileDataSource());
   CHECK_EQ(file_data_source->Initialize(file), media::PIPELINE_OK);
   return file_data_source;
 }
@@ skipping 180 matching lines @@
               << "  [--audio]"
               << "  [--alsa-device=DEVICE]"
               << "  [--use-gl]"
               << "  [--streaming]" << std::endl
               << " Press [ESC] to stop" << std::endl
               << " Press [SPACE] to toggle pause/play" << std::endl
               << " Press mouse left button to seek" << std::endl;
     return 1;
   }
 
-  scoped_ptr<media::AudioManager> audio_manager(media::AudioManager::Create());
+  scoped_ptr<AudioManager> audio_manager(AudioManager::Create());
   g_audio_manager = audio_manager.get();
 
   logging::InitLogging(
       NULL,
       logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
       logging::LOCK_LOG_FILE,  // Ignored.
       logging::DELETE_OLD_LOG_FILE,  // Ignored.
       logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
 
   // Install the signal handler.
@@ skipping 47 matching lines @@
   // Release callback which releases video renderer. Do this before cleaning up
   // X below since the video renderer has some X cleanup duties as well.
   paint_cb.Reset();
 
   XDestroyWindow(g_display, g_window);
   XCloseDisplay(g_display);
   g_audio_manager = NULL;
 
   return 0;
 }