From 15845af3cdb27b218b1d3bf7b13e0e1bbb210a37 Mon Sep 17 00:00:00 2001 From: Harald Alvestrand Date: Tue, 5 Mar 2019 09:50:57 +0100 Subject: [PATCH] Reland "Another mock for GetSctpTransport" (and add test) 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 > > Commit-Queue: Harald Alvestrand > > 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 > Commit-Queue: Harald Alvestrand > 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 Reviewed-by: Karl Wiberg Commit-Queue: Harald Alvestrand Cr-Commit-Position: refs/heads/master@{#26964} --- api/test/mock_peerconnectioninterface.h | 3 +++ pc/test/fake_peer_connection_base.h | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/api/test/mock_peerconnectioninterface.h b/api/test/mock_peerconnectioninterface.h index 86abad5eac..d4450069c5 100644 --- a/api/test/mock_peerconnectioninterface.h +++ b/api/test/mock_peerconnectioninterface.h @@ -17,6 +17,7 @@ #include #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, rtc::scoped_refptr)); MOCK_METHOD0(ClearStatsCache, void()); + MOCK_CONST_METHOD0(GetSctpTransport, + rtc::scoped_refptr()); MOCK_METHOD2( CreateDataChannel, rtc::scoped_refptr(const std::string&, diff --git a/pc/test/fake_peer_connection_base.h b/pc/test/fake_peer_connection_base.h index 85feebc358..d2fa1fd7d8 100644 --- a/pc/test/fake_peer_connection_base.h +++ b/pc/test/fake_peer_connection_base.h @@ -17,6 +17,7 @@ #include #include +#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 GetSctpTransport() const { + return nullptr; + } + rtc::scoped_refptr CreateDataChannel( const std::string& label, const DataChannelInit* config) override {