| Index: webrtc/test/mock_audio_decoder_factory.h
|
| diff --git a/webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h b/webrtc/test/mock_audio_decoder_factory.h
|
| similarity index 90%
|
| rename from webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h
|
| rename to webrtc/test/mock_audio_decoder_factory.h
|
| index 3b91491e7f249f1d0bee8bb2c724847704fd20b6..24eb44eb67082b7a54c6295a5486df7d65075fdb 100644
|
| --- a/webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h
|
| +++ b/webrtc/test/mock_audio_decoder_factory.h
|
| @@ -8,9 +8,10 @@
|
| * be found in the AUTHORS file in the root of the source tree.
|
| */
|
|
|
| -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_MOCK_MOCK_AUDIO_DECODER_FACTORY_H_
|
| -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_MOCK_MOCK_AUDIO_DECODER_FACTORY_H_
|
| +#ifndef WEBRTC_TEST_MOCK_AUDIO_DECODER_FACTORY_H_
|
| +#define WEBRTC_TEST_MOCK_AUDIO_DECODER_FACTORY_H_
|
|
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "webrtc/api/audio_codecs/audio_decoder_factory.h"
|
| @@ -24,8 +25,7 @@ class MockAudioDecoderFactory : public AudioDecoderFactory {
|
| public:
|
| MOCK_METHOD0(GetSupportedDecoders, std::vector<AudioCodecSpec>());
|
| MOCK_METHOD1(IsSupportedDecoder, bool(const SdpAudioFormat&));
|
| - std::unique_ptr<AudioDecoder> MakeAudioDecoder(
|
| - const SdpAudioFormat& format) {
|
| + std::unique_ptr<AudioDecoder> MakeAudioDecoder(const SdpAudioFormat& format) {
|
| std::unique_ptr<AudioDecoder> return_value;
|
| MakeAudioDecoderMock(format, &return_value);
|
| return return_value;
|
| @@ -80,4 +80,4 @@ class MockAudioDecoderFactory : public AudioDecoderFactory {
|
|
|
| } // namespace webrtc
|
|
|
| -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_MOCK_MOCK_AUDIO_DECODER_FACTORY_H_
|
| +#endif // WEBRTC_TEST_MOCK_AUDIO_DECODER_FACTORY_H_
|
|
|