| Index: webrtc/media/base/fakemediaengine.h
|
| diff --git a/webrtc/media/base/fakemediaengine.h b/webrtc/media/base/fakemediaengine.h
|
| index 6feaf8e989f7e3e1569cfb060c816a6d651ba309..d6d653991c69ddce38e93ca61b0b6bc952ceea5d 100644
|
| --- a/webrtc/media/base/fakemediaengine.h
|
| +++ b/webrtc/media/base/fakemediaengine.h
|
| @@ -696,14 +696,12 @@ class FakeBaseEngine {
|
|
|
| class FakeVoiceEngine : public FakeBaseEngine {
|
| public:
|
| - FakeVoiceEngine()
|
| + explicit FakeVoiceEngine(webrtc::AudioDeviceModule* adm)
|
| : output_volume_(-1) {
|
| // Add a fake audio codec. Note that the name must not be "" as there are
|
| // sanity checks against that.
|
| codecs_.push_back(AudioCodec(101, "fake_audio_codec", 0, 0, 1, 0));
|
| }
|
| - bool Init(rtc::Thread* worker_thread) { return true; }
|
| - void Terminate() {}
|
| rtc::scoped_refptr<webrtc::AudioState> GetAudioState() const {
|
| return rtc::scoped_refptr<webrtc::AudioState>();
|
| }
|
| @@ -810,7 +808,8 @@ class FakeVideoEngine : public FakeBaseEngine {
|
| class FakeMediaEngine :
|
| public CompositeMediaEngine<FakeVoiceEngine, FakeVideoEngine> {
|
| public:
|
| - FakeMediaEngine() {}
|
| + FakeMediaEngine() :
|
| + CompositeMediaEngine<FakeVoiceEngine, FakeVideoEngine>(nullptr) {}
|
| virtual ~FakeMediaEngine() {}
|
|
|
| void SetAudioCodecs(const std::vector<AudioCodec>& codecs) {
|
|
|