Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Side by Side Diff: webrtc/api/test/mock_webrtcsession.h

Issue 2614813003: Revert of Separating SCTP code from BaseChannel/MediaChannel. (Closed)
Patch Set: Also reverting https://codereview.webrtc.org/2612963002 Created 3 years, 11 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:
View unified diff | Download patch
« no previous file with comments | « webrtc/api/rtcstatscollector.cc ('k') | webrtc/api/webrtcsdp.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_API_TEST_MOCK_WEBRTCSESSION_H_ 11 #ifndef WEBRTC_API_TEST_MOCK_WEBRTCSESSION_H_
12 #define WEBRTC_API_TEST_MOCK_WEBRTCSESSION_H_ 12 #define WEBRTC_API_TEST_MOCK_WEBRTCSESSION_H_
13 13
14 #include <memory> 14 #include <memory>
15 #include <string> 15 #include <string>
16 16
17 #include "webrtc/api/webrtcsession.h" 17 #include "webrtc/api/webrtcsession.h"
18 #include "webrtc/media/sctp/sctptransportinternal.h"
19 #include "webrtc/test/gmock.h" 18 #include "webrtc/test/gmock.h"
20 19
21 namespace webrtc { 20 namespace webrtc {
22 21
23 class MockWebRtcSession : public webrtc::WebRtcSession { 22 class MockWebRtcSession : public webrtc::WebRtcSession {
24 public: 23 public:
25 // TODO(nisse): Valid overrides commented out, because the gmock 24 // TODO(nisse): Valid overrides commented out, because the gmock
26 // methods don't use any override declarations, and we want to avoid 25 // methods don't use any override declarations, and we want to avoid
27 // warnings from -Winconsistent-missing-override. See 26 // warnings from -Winconsistent-missing-override. See
28 // http://crbug.com/428099. 27 // http://crbug.com/428099.
29 explicit MockWebRtcSession(MediaControllerInterface* media_controller) 28 explicit MockWebRtcSession(MediaControllerInterface* media_controller)
30 : WebRtcSession( 29 : WebRtcSession(
31 media_controller, 30 media_controller,
32 rtc::Thread::Current(), 31 rtc::Thread::Current(),
33 rtc::Thread::Current(), 32 rtc::Thread::Current(),
34 rtc::Thread::Current(), 33 rtc::Thread::Current(),
35 nullptr, 34 nullptr,
36 std::unique_ptr<cricket::TransportController>( 35 std::unique_ptr<cricket::TransportController>(
37 new cricket::TransportController(rtc::Thread::Current(), 36 new cricket::TransportController(rtc::Thread::Current(),
38 rtc::Thread::Current(), 37 rtc::Thread::Current(),
39 nullptr)), 38 nullptr))) {}
40 std::unique_ptr<cricket::SctpTransportInternalFactory>()) {}
41 MOCK_METHOD0(voice_channel, cricket::VoiceChannel*()); 39 MOCK_METHOD0(voice_channel, cricket::VoiceChannel*());
42 MOCK_METHOD0(video_channel, cricket::VideoChannel*()); 40 MOCK_METHOD0(video_channel, cricket::VideoChannel*());
43 // Libjingle uses "local" for a outgoing track, and "remote" for a incoming 41 // Libjingle uses "local" for a outgoing track, and "remote" for a incoming
44 // track. 42 // track.
45 MOCK_METHOD2(GetLocalTrackIdBySsrc, bool(uint32_t, std::string*)); 43 MOCK_METHOD2(GetLocalTrackIdBySsrc, bool(uint32_t, std::string*));
46 MOCK_METHOD2(GetRemoteTrackIdBySsrc, bool(uint32_t, std::string*)); 44 MOCK_METHOD2(GetRemoteTrackIdBySsrc, bool(uint32_t, std::string*));
47 MOCK_METHOD1(GetStats, 45 MOCK_METHOD1(GetStats,
48 std::unique_ptr<SessionStats>(const ChannelNamePairs&)); 46 std::unique_ptr<SessionStats>(const ChannelNamePairs&));
49 MOCK_METHOD2(GetLocalCertificate, 47 MOCK_METHOD2(GetLocalCertificate,
50 bool(const std::string& transport_name, 48 bool(const std::string& transport_name,
51 rtc::scoped_refptr<rtc::RTCCertificate>* certificate)); 49 rtc::scoped_refptr<rtc::RTCCertificate>* certificate));
52 50
53 // Workaround for gmock's inability to cope with move-only return values. 51 // Workaround for gmock's inability to cope with move-only return values.
54 std::unique_ptr<rtc::SSLCertificate> GetRemoteSSLCertificate( 52 std::unique_ptr<rtc::SSLCertificate> GetRemoteSSLCertificate(
55 const std::string& transport_name) /* override */ { 53 const std::string& transport_name) /* override */ {
56 return std::unique_ptr<rtc::SSLCertificate>( 54 return std::unique_ptr<rtc::SSLCertificate>(
57 GetRemoteSSLCertificate_ReturnsRawPointer(transport_name)); 55 GetRemoteSSLCertificate_ReturnsRawPointer(transport_name));
58 } 56 }
59 MOCK_METHOD1(GetRemoteSSLCertificate_ReturnsRawPointer, 57 MOCK_METHOD1(GetRemoteSSLCertificate_ReturnsRawPointer,
60 rtc::SSLCertificate*(const std::string& transport_name)); 58 rtc::SSLCertificate*(const std::string& transport_name));
61 }; 59 };
62 60
63 } // namespace webrtc 61 } // namespace webrtc
64 62
65 #endif // WEBRTC_API_TEST_MOCK_WEBRTCSESSION_H_ 63 #endif // WEBRTC_API_TEST_MOCK_WEBRTCSESSION_H_
OLDNEW
« no previous file with comments | « webrtc/api/rtcstatscollector.cc ('k') | webrtc/api/webrtcsdp.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698