commit b63331bb8f7fc21ceb2d3dabfd977e535559ff23
author Danil Chapovalov <danilchap@webrtc.org> Thu May 07 11:52:45 2020 +0200
committer Commit Bot <commit-bot@chromium.org> Thu May 07 11:58:50 2020 +0000
tree 4df1d3e8c035b356122867f5acc838457a147156
parent 1e83d34fc1fd0ddc15e7583c4b0e73ebfb7c17c7

Cleanup mocks for Video (en|de)coder factories

In particular remove proxy mocks in favor of lambdas and Return(ByMove(...))

Bug: None
Change-Id: If6b79601437e82a7116479d128d538e965622fab
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/174701
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31179}

api/test/mock_video_decoder_factory.h

diff --git a/api/test/mock_video_decoder_factory.h b/api/test/mock_video_decoder_factory.h
index 915e391..1f832a1 100644
--- a/api/test/mock_video_decoder_factory.h
+++ b/api/test/mock_video_decoder_factory.h
@@ -22,20 +22,17 @@
 
 class MockVideoDecoderFactory : public webrtc::VideoDecoderFactory {
  public:
-  MOCK_CONST_METHOD0(GetSupportedFormats,
-                     std::vector<webrtc::SdpVideoFormat>());
+  ~MockVideoDecoderFactory() override { Die(); }
 
-  // We need to proxy to a return type that is copyable.
-  std::unique_ptr<webrtc::VideoDecoder> CreateVideoDecoder(
-      const webrtc::SdpVideoFormat& format) {
-    return std::unique_ptr<webrtc::VideoDecoder>(
-        CreateVideoDecoderProxy(format));
-  }
-  MOCK_METHOD1(CreateVideoDecoderProxy,
-               webrtc::VideoDecoder*(const webrtc::SdpVideoFormat&));
-
-  MOCK_METHOD0(Die, void());
-  ~MockVideoDecoderFactory() { Die(); }
+  MOCK_METHOD(std::vector<webrtc::SdpVideoFormat>,
+              GetSupportedFormats,
+              (),
+              (const override));
+  MOCK_METHOD(std::unique_ptr<webrtc::VideoDecoder>,
+              CreateVideoDecoder,
+              (const webrtc::SdpVideoFormat&),
+              (override));
+  MOCK_METHOD(void, Die, (), ());
 };
 }  // namespace webrtc
 

api/test/mock_video_encoder_factory.h

diff --git a/api/test/mock_video_encoder_factory.h b/api/test/mock_video_encoder_factory.h
index a694b63..fa08dbd 100644
--- a/api/test/mock_video_encoder_factory.h
+++ b/api/test/mock_video_encoder_factory.h
@@ -22,22 +22,22 @@
 
 class MockVideoEncoderFactory : public webrtc::VideoEncoderFactory {
  public:
-  MOCK_CONST_METHOD0(GetSupportedFormats,
-                     std::vector<webrtc::SdpVideoFormat>());
-  MOCK_CONST_METHOD1(QueryVideoEncoder,
-                     CodecInfo(const webrtc::SdpVideoFormat&));
+  ~MockVideoEncoderFactory() override { Die(); }
 
-  // We need to proxy to a return type that is copyable.
-  std::unique_ptr<webrtc::VideoEncoder> CreateVideoEncoder(
-      const webrtc::SdpVideoFormat& format) {
-    return std::unique_ptr<webrtc::VideoEncoder>(
-        CreateVideoEncoderProxy(format));
-  }
-  MOCK_METHOD1(CreateVideoEncoderProxy,
-               webrtc::VideoEncoder*(const webrtc::SdpVideoFormat&));
+  MOCK_METHOD(std::vector<SdpVideoFormat>,
+              GetSupportedFormats,
+              (),
+              (const override));
+  MOCK_METHOD(CodecInfo,
+              QueryVideoEncoder,
+              (const SdpVideoFormat&),
+              (const override));
+  MOCK_METHOD(std::unique_ptr<VideoEncoder>,
+              CreateVideoEncoder,
+              (const SdpVideoFormat&),
+              (override));
 
-  MOCK_METHOD0(Die, void());
-  ~MockVideoEncoderFactory() { Die(); }
+  MOCK_METHOD(void, Die, (), ());
 };
 
 }  // namespace webrtc