Move media/audio files into media namespace

content/browser/renderer_host/media/media_stream_manager.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 "content/browser/renderer_host/media/media_stream_manager.h"
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 83 matching lines @@
   std::vector<RequestState> state;
   RequestType type;
   std::string requested_device_id;
   StreamDeviceInfoArray audio_devices;
   StreamDeviceInfoArray video_devices;
 };
 
 // static
 MediaStreamManager* MediaStreamManager::GetForResourceContext(
     content::ResourceContext* resource_context,
-    AudioManager* audio_manager) {
+    media::AudioManager* audio_manager) {
   MediaStreamManager* rv = static_cast<MediaStreamManager*>(
       resource_context->GetUserData(kMediaStreamManagerKeyName));
   if (!rv) {
     rv = new MediaStreamManager(audio_manager);
     resource_context->SetUserData(kMediaStreamManagerKeyName, rv);
   }
   return rv;
 }
 
-MediaStreamManager::MediaStreamManager(AudioManager* audio_manager)
+MediaStreamManager::MediaStreamManager(media::AudioManager* audio_manager)
     : ALLOW_THIS_IN_INITIALIZER_LIST(
           device_settings_(new MediaStreamDeviceSettings(this))),
       enumeration_in_progress_(content::NUM_MEDIA_STREAM_DEVICE_TYPES, false),
       audio_manager_(audio_manager) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 }
 
 MediaStreamManager::~MediaStreamManager() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (video_capture_manager_.get())
@@ skipping 463 matching lines @@
   if (stream_type == content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE) {
     return video_capture_manager();
   } else if (stream_type == content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE) {
     return audio_input_device_manager();
   }
   NOTREACHED();
   return NULL;
 }
 
 }  // namespace media_stream