Chromium Code Reviews

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

Issue 2468093004: WebRTC: Fix and enable -Woverloaded-virtual warnings. (Closed)
Patch Set: Fixed errors and reverted video capture changes Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
« no previous file with comments | « webrtc/api/peerconnectioninterface_unittest.cc ('k') | webrtc/media/BUILD.gn » ('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 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2013 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_PEERCONNECTIONTESTWRAPPER_H_ 11 #ifndef WEBRTC_API_TEST_PEERCONNECTIONTESTWRAPPER_H_
12 #define WEBRTC_API_TEST_PEERCONNECTIONTESTWRAPPER_H_ 12 #define WEBRTC_API_TEST_PEERCONNECTIONTESTWRAPPER_H_
13 13
14 #include <memory> 14 #include <memory>
15 15
16 #include "webrtc/api/peerconnectioninterface.h" 16 #include "webrtc/api/peerconnectioninterface.h"
17 #include "webrtc/api/test/fakeaudiocapturemodule.h" 17 #include "webrtc/api/test/fakeaudiocapturemodule.h"
18 #include "webrtc/api/test/fakeconstraints.h" 18 #include "webrtc/api/test/fakeconstraints.h"
19 #include "webrtc/api/test/fakevideotrackrenderer.h" 19 #include "webrtc/api/test/fakevideotrackrenderer.h"
20 #include "webrtc/base/sigslot.h" 20 #include "webrtc/base/sigslot.h"
21 21
22 class PeerConnectionTestWrapper 22 class PeerConnectionTestWrapper
23 : public webrtc::PeerConnectionObserver, 23 : public webrtc::PeerConnectionObserver,
24 public webrtc::CreateSessionDescriptionObserver, 24 public webrtc::CreateSessionDescriptionObserver,
25 public sigslot::has_slots<> { 25 public sigslot::has_slots<> {
26 public: 26 public:
27 // We need these using declarations because there are two versions of each of
28 // the below methods and we only override one of them.
29 // TODO(deadbeef): Remove once there's only one version of the methods.
30 using PeerConnectionObserver::OnAddStream;
31 using PeerConnectionObserver::OnRemoveStream;
32 using PeerConnectionObserver::OnDataChannel;
33
27 static void Connect(PeerConnectionTestWrapper* caller, 34 static void Connect(PeerConnectionTestWrapper* caller,
28 PeerConnectionTestWrapper* callee); 35 PeerConnectionTestWrapper* callee);
29 36
30 PeerConnectionTestWrapper(const std::string& name, 37 PeerConnectionTestWrapper(const std::string& name,
31 rtc::Thread* network_thread, 38 rtc::Thread* network_thread,
32 rtc::Thread* worker_thread); 39 rtc::Thread* worker_thread);
33 virtual ~PeerConnectionTestWrapper(); 40 virtual ~PeerConnectionTestWrapper();
34 41
35 bool CreatePc( 42 bool CreatePc(
36 const webrtc::MediaConstraintsInterface* constraints, 43 const webrtc::MediaConstraintsInterface* constraints,
(...skipping 63 matching lines...)
100 rtc::Thread* const network_thread_; 107 rtc::Thread* const network_thread_;
101 rtc::Thread* const worker_thread_; 108 rtc::Thread* const worker_thread_;
102 rtc::scoped_refptr<webrtc::PeerConnectionInterface> peer_connection_; 109 rtc::scoped_refptr<webrtc::PeerConnectionInterface> peer_connection_;
103 rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> 110 rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface>
104 peer_connection_factory_; 111 peer_connection_factory_;
105 rtc::scoped_refptr<FakeAudioCaptureModule> fake_audio_capture_module_; 112 rtc::scoped_refptr<FakeAudioCaptureModule> fake_audio_capture_module_;
106 std::unique_ptr<webrtc::FakeVideoTrackRenderer> renderer_; 113 std::unique_ptr<webrtc::FakeVideoTrackRenderer> renderer_;
107 }; 114 };
108 115
109 #endif // WEBRTC_API_TEST_PEERCONNECTIONTESTWRAPPER_H_ 116 #endif // WEBRTC_API_TEST_PEERCONNECTIONTESTWRAPPER_H_
OLDNEW
« no previous file with comments | « webrtc/api/peerconnectioninterface_unittest.cc ('k') | webrtc/media/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine