| Index: webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h
|
| diff --git a/webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h b/webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h
|
| index 09cd07895330b15f7efc4f1a7bd57bcb5332cc59..58a1e756f971a013e9615630c6fd1df7adb2dfd7 100644
|
| --- a/webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h
|
| +++ b/webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h
|
| @@ -43,10 +43,8 @@ class MockAudioEncoderBase : public AudioEncoder {
|
|
|
| class MockAudioEncoder final : public MockAudioEncoderBase {
|
| public:
|
| - using AudioEncoder::EncodeInternal;
|
| -
|
| // Note, we explicitly chose not to create a mock for the Encode method.
|
| - MOCK_METHOD3(EncodeInternal,
|
| + MOCK_METHOD3(EncodeImpl,
|
| EncodedInfo(uint32_t timestamp,
|
| rtc::ArrayView<const int16_t> audio,
|
| rtc::Buffer* encoded));
|
| @@ -96,8 +94,6 @@ class MockAudioEncoder final : public MockAudioEncoderBase {
|
|
|
| class MockAudioEncoderDeprecated final : public MockAudioEncoderBase {
|
| public:
|
| - using AudioEncoder::EncodeInternal;
|
| -
|
| // Note, we explicitly chose not to create a mock for the Encode method.
|
| MOCK_METHOD4(EncodeInternal,
|
| EncodedInfo(uint32_t timestamp,
|
|
|