| Index: content/browser/renderer_host/media/media_stream_manager.cc
|
| diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc
|
| index 82c0763e4a46a206a3d8c424f1766e3109560793..994725b9308187c29f8c5d4b440e5fe661829e83 100644
|
| --- a/content/browser/renderer_host/media/media_stream_manager.cc
|
| +++ b/content/browser/renderer_host/media/media_stream_manager.cc
|
| @@ -101,7 +101,7 @@ struct MediaStreamManager::DeviceRequest {
|
| // 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) {
|
| @@ -111,7 +111,7 @@ MediaStreamManager* MediaStreamManager::GetForResourceContext(
|
| 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),
|
|
|