| Index: media/mojo/services/default_mojo_media_client.cc
|
| diff --git a/media/mojo/services/default_mojo_media_client.cc b/media/mojo/services/default_mojo_media_client.cc
|
| index 47b6a36a015eb59503f98958e212ccf629955d88..31c2863b44f6c2c1a7bee7494b09edada6e6bdb1 100644
|
| --- a/media/mojo/services/default_mojo_media_client.cc
|
| +++ b/media/mojo/services/default_mojo_media_client.cc
|
| @@ -8,6 +8,7 @@
|
| #include "media/audio/audio_manager_base.h"
|
| #include "media/audio/audio_output_stream_sink.h"
|
| #include "media/audio/fake_audio_log_factory.h"
|
| +#include "media/base/audio_hardware_config.h"
|
| #include "media/base/media.h"
|
| #include "media/base/null_video_sink.h"
|
| #include "media/cdm/default_cdm_factory.h"
|
| @@ -55,10 +56,6 @@ class DefaultMojoMediaClient : public PlatformMojoMediaClient {
|
| NullVideoSink::NewFrameCB(), task_runner));
|
| }
|
|
|
| - const AudioHardwareConfig* GetAudioHardwareConfig() override {
|
| - return audio_hardware_config_.get();
|
| - }
|
| -
|
| scoped_ptr<CdmFactory> CreateCdmFactory(
|
| mojo::ServiceProvider* /* service_provider */) override {
|
| return make_scoped_ptr(new DefaultCdmFactory());
|
|
|