webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h - Issue 1373903003: Unify newapi::RtcpMode and RTCPMethod.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h

Issue 1373903003: Unify newapi::RtcpMode and RTCPMethod. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: ehm, compile the code Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h

diff --git a/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h b/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h

index fe63239d8532bb22f6414e5cfdb85e0344a1b7c9..bc4aec8967e3137140b89994cfef017603a8970f 100644

--- a/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h

+++ b/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h

@@ -130,9 +130,8 @@ class MockRtpRtcp : public RtpRtcp {

MOCK_METHOD2(RegisterRtcpObservers,

void(RtcpIntraFrameObserver* intraFrameCallback,

RtcpBandwidthObserver* bandwidthCallback));

- MOCK_CONST_METHOD0(RTCP,

- RTCPMethod());

- MOCK_METHOD1(SetRTCPStatus, void(const RTCPMethod method));

+ MOCK_CONST_METHOD0(RTCP, RtcpMode());

+ MOCK_METHOD1(SetRTCPStatus, void(const RtcpMode method));

MOCK_METHOD1(SetCNAME,

int32_t(const char cName[RTCP_CNAME_SIZE]));

MOCK_CONST_METHOD2(RemoteCNAME,