diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-23 23:07:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-23 23:07:18 +0000 |
| commit | 9e9b79187bff6d54f8e15db1978c157f8dda9335 (patch) | |
| tree | 9ba6a46a7e4cd59e1018b94136f46578efe31f2e /media/base/media_engine_unittest.cc | |
| parent | 37f9b0ea9ea6a8c490bdb0dc2f44a586b01c8ab2 (diff) | |
| parent | 206ccd0b36df69a0d0d0d26ddf7c4ead20202f91 (diff) | |
| download | webrtc-9e9b79187bff6d54f8e15db1978c157f8dda9335.tar.gz | |
Merge changes Ida3bfe62,I2d596942
* changes:
Merge remote tracking branch 'upstream-master'
Generate new Android.bp file and correct build errors
Diffstat (limited to 'media/base/media_engine_unittest.cc')
| -rw-r--r-- | media/base/media_engine_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/base/media_engine_unittest.cc b/media/base/media_engine_unittest.cc index f4c6f5f045..83f80c4669 100644 --- a/media/base/media_engine_unittest.cc +++ b/media/base/media_engine_unittest.cc @@ -26,8 +26,10 @@ namespace { class MockRtpHeaderExtensionQueryInterface : public RtpHeaderExtensionQueryInterface { public: - MOCK_CONST_METHOD0(GetRtpHeaderExtensions, - std::vector<RtpHeaderExtensionCapability>()); + MOCK_METHOD(std::vector<RtpHeaderExtensionCapability>, + GetRtpHeaderExtensions, + (), + (const, override)); }; } // namespace |