| Index: content/renderer/media/audio_device_factory.cc
|
| ===================================================================
|
| --- content/renderer/media/audio_device_factory.cc (revision 148738)
|
| +++ content/renderer/media/audio_device_factory.cc (working copy)
|
| @@ -6,10 +6,10 @@
|
|
|
| #include "base/logging.h"
|
| #include "content/common/child_process.h"
|
| -#include "content/renderer/media/audio_device.h"
|
| -#include "content/renderer/media/audio_input_device.h"
|
| #include "content/renderer/media/audio_input_message_filter.h"
|
| #include "content/renderer/media/audio_message_filter.h"
|
| +#include "media/audio/audio_input_device.h"
|
| +#include "media/audio/audio_output_device.h"
|
|
|
| namespace content {
|
|
|
| @@ -22,18 +22,18 @@
|
| if (factory_)
|
| device = factory_->CreateOutputDevice();
|
|
|
| - return device ? device : new AudioDevice(
|
| + return device ? device : new media::AudioOutputDevice(
|
| AudioMessageFilter::Get(),
|
| ChildProcess::current()->io_message_loop()->message_loop_proxy());
|
| }
|
|
|
| // static
|
| -AudioInputDevice* AudioDeviceFactory::NewInputDevice() {
|
| - AudioInputDevice* device = NULL;
|
| +media::AudioInputDevice* AudioDeviceFactory::NewInputDevice() {
|
| + media::AudioInputDevice* device = NULL;
|
| if (factory_)
|
| device = factory_->CreateInputDevice();
|
|
|
| - return device ? device : new AudioInputDevice(
|
| + return device ? device : new media::AudioInputDevice(
|
| AudioInputMessageFilter::Get(),
|
| ChildProcess::current()->io_message_loop()->message_loop_proxy());
|
| }
|
|
|