admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reland "Another mock for GetSctpTransport" (and add test)

Browse Source 
This reverts commit 727504cf493f9e03952a6e88348976385a49b9e2.

Reason for revert: Added required INCLUDE to fix compile errors.

Original change's description:
> Revert "Another mock for GetSctpTransport"
>
> This reverts commit b2c4700d39fbedaff9bdbee934e1f3f8032bb35b.
>
> Reason for revert: Breaks Chrome build
>
> Original change's description:
> > Another mock for GetSctpTransport
> >
> > Bug: chromium:818643
> > Change-Id: I4ae7826efa7afa8e7b2ecd8a5928071a1b913ded
> > Reviewed-on: https://webrtc-review.googlesource.com/c/125340
> > Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
> > Commit-Queue: Harald Alvestrand <hta@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#26941}
>
> TBR=kwiberg@webrtc.org,hta@webrtc.org
>
> Change-Id: I98ddc61ca1e76d69b84138419d91ad9e40b04b1d
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: chromium:818643
> Reviewed-on: https://webrtc-review.googlesource.com/c/125380
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Commit-Queue: Harald Alvestrand <hta@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#26943}

TBR=kwiberg@webrtc.org,hta@webrtc.org

Change-Id: I3eb410427f6660cd00319b43e7096bd634290e8a
Bug: chromium:818643
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/125381
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26964}
This commit is contained in:
Harald Alvestrand 2019-03-05 09:50:57 +01:00 committed by Commit Bot
parent 9b9344742b
commit 15845af3cd
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/test/mock_peerconnectioninterface.h
View File

@ -17,6 +17,7 @@
#include <vector>
#include "api/peer_connection_interface.h"
#include "api/sctp_transport_interface.h"
#include "test/gmock.h"
namespace webrtc {
@ -74,6 +75,8 @@ class MockPeerConnectionInterface
void(rtc::scoped_refptr<RtpReceiverInterface>,
rtc::scoped_refptr<RTCStatsCollectorCallback>));
MOCK_METHOD0(ClearStatsCache, void());
MOCK_CONST_METHOD0(GetSctpTransport,
rtc::scoped_refptr<SctpTransportInterface>());
MOCK_METHOD2(
CreateDataChannel,
rtc::scoped_refptr<DataChannelInterface>(const std::string&,

5
pc/test/fake_peer_connection_base.h
View File

@ -17,6 +17,7 @@
#include <string>
#include <vector>
#include "api/sctp_transport_interface.h"
#include "pc/peer_connection_internal.h"
namespace webrtc {
@ -108,6 +109,10 @@ class FakePeerConnectionBase : public PeerConnectionInternal {
void ClearStatsCache() override {}
rtc::scoped_refptr<SctpTransportInterface> GetSctpTransport() const {
return nullptr;
}
rtc::scoped_refptr<DataChannelInterface> CreateDataChannel(
const std::string& label,
const DataChannelInit* config) override {