zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add checks for api/test mocks to make sure they're complete"

Browse Source 
This reverts commit e87ec28b807f84babe228f54690c686fcf86a0fb.

Reason for revert: Breaks upstream.

Original change's description:
> Add checks for api/test mocks to make sure they're complete
>
> Also unifies the mock inheritance if they inherited from a ref counted
> interface:
>  - it should only inherit from the interface
>  - it should use make_ref_counted
>
> Bug: webrtc:14594
> Change-Id: I7b0514b632ccd0798028b50f19812ac0a196e13c
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262423
> Commit-Queue: Florent Castelli <orphis@webrtc.org>
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#38602}

Bug: webrtc:14594
Change-Id: I9f2d9c3656b43e3006ec03ae7d792d0a53f47ebd
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/282940
Auto-Submit: Florent Castelli <orphis@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#38604}
This commit is contained in:
Florent Castelli
2022-11-10 13:28:42 +00:00
committed by WebRTC LUCI CQ
parent 389228d0f0
commit 123a0ed604
25 changed files with 62 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/test/mock_data_channel.h
View File

@ -14,15 +14,16 @@
#include <string>
#include "api/data_channel_interface.h"
#include "api/make_ref_counted.h"
#include "test/gmock.h"
namespace webrtc {
class MockDataChannelInterface : public webrtc::DataChannelInterface {
class MockDataChannelInterface final
: public rtc::RefCountedObject<webrtc::DataChannelInterface> {
public:
static rtc::scoped_refptr<MockDataChannelInterface> Create() {
return rtc::make_ref_counted<MockDataChannelInterface>();
return rtc::scoped_refptr<MockDataChannelInterface>(
new MockDataChannelInterface());
}
MOCK_METHOD(void,
@ -55,9 +56,6 @@ class MockDataChannelInterface : public webrtc::DataChannelInterface {
MockDataChannelInterface() = default;
};
static_assert(
!std::is_abstract_v<rtc::RefCountedObject<MockDataChannelInterface>>);
} // namespace webrtc
#endif // API_TEST_MOCK_DATA_CHANNEL_H_