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

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

Issue 2794943002: Delete MediaController class, move Call ownership to PeerConnection. (Closed)
Patch Set: Revert DCHECK addition. Created 3 years, 7 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
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_PC_TEST_MOCK_WEBRTCSESSION_H_ 11 #ifndef WEBRTC_PC_TEST_MOCK_WEBRTCSESSION_H_
12 #define WEBRTC_PC_TEST_MOCK_WEBRTCSESSION_H_ 12 #define WEBRTC_PC_TEST_MOCK_WEBRTCSESSION_H_
13 13
14 #include <memory> 14 #include <memory>
15 #include <string> 15 #include <string>
16 16
17 #include "webrtc/pc/webrtcsession.h" 17 #include "webrtc/pc/webrtcsession.h"
18 #include "webrtc/media/sctp/sctptransportinternal.h" 18 #include "webrtc/media/sctp/sctptransportinternal.h"
19 #include "webrtc/test/gmock.h" 19 #include "webrtc/test/gmock.h"
20 20
21 namespace webrtc { 21 namespace webrtc {
22 22
23 class MockWebRtcSession : public webrtc::WebRtcSession { 23 class MockWebRtcSession : public webrtc::WebRtcSession {
24 public: 24 public:
25 // TODO(nisse): Valid overrides commented out, because the gmock 25 // TODO(nisse): Valid overrides commented out, because the gmock
26 // methods don't use any override declarations, and we want to avoid 26 // methods don't use any override declarations, and we want to avoid
27 // warnings from -Winconsistent-missing-override. See 27 // warnings from -Winconsistent-missing-override. See
28 // http://crbug.com/428099. 28 // http://crbug.com/428099.
29 explicit MockWebRtcSession(MediaControllerInterface* media_controller) 29 explicit MockWebRtcSession(cricket::ChannelManager* channel_manager,
30 : WebRtcSession( 30 const cricket::MediaConfig& media_config)
31 media_controller, 31 : WebRtcSession(nullptr /* Call */,
32 channel_manager,
33 media_config,
34 nullptr, // event_log
32 rtc::Thread::Current(), 35 rtc::Thread::Current(),
33 rtc::Thread::Current(), 36 rtc::Thread::Current(),
34 rtc::Thread::Current(), 37 rtc::Thread::Current(),
35 nullptr, 38 nullptr,
36 std::unique_ptr<cricket::TransportController>( 39 std::unique_ptr<cricket::TransportController>(
37 new cricket::TransportController( 40 new cricket::TransportController(
38 rtc::Thread::Current(), 41 rtc::Thread::Current(),
39 rtc::Thread::Current(), 42 rtc::Thread::Current(),
40 nullptr, 43 nullptr,
41 /*redetermine_role_on_ice_restart=*/true, 44 /*redetermine_role_on_ice_restart=*/true,
(...skipping 17 matching lines...) Expand all
59 return std::unique_ptr<rtc::SSLCertificate>( 62 return std::unique_ptr<rtc::SSLCertificate>(
60 GetRemoteSSLCertificate_ReturnsRawPointer(transport_name)); 63 GetRemoteSSLCertificate_ReturnsRawPointer(transport_name));
61 } 64 }
62 MOCK_METHOD1(GetRemoteSSLCertificate_ReturnsRawPointer, 65 MOCK_METHOD1(GetRemoteSSLCertificate_ReturnsRawPointer,
63 rtc::SSLCertificate*(const std::string& transport_name)); 66 rtc::SSLCertificate*(const std::string& transport_name));
64 }; 67 };
65 68
66 } // namespace webrtc 69 } // namespace webrtc
67 70
68 #endif // WEBRTC_PC_TEST_MOCK_WEBRTCSESSION_H_ 71 #endif // WEBRTC_PC_TEST_MOCK_WEBRTCSESSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698