Chromium Code Reviews

Side by Side Diff: webrtc/api/peerconnection_unittest.cc

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/BUILD.gn ('k') | webrtc/api/peerconnectionfactory_unittest.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 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 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
(...skipping 170 matching lines...)
181 private: 181 private:
182 bool first_packet_received_ = false; 182 bool first_packet_received_ = false;
183 cricket::MediaType expected_media_type_; 183 cricket::MediaType expected_media_type_;
184 }; 184 };
185 185
186 class PeerConnectionTestClient : public webrtc::PeerConnectionObserver, 186 class PeerConnectionTestClient : public webrtc::PeerConnectionObserver,
187 public SignalingMessageReceiver, 187 public SignalingMessageReceiver,
188 public ObserverInterface, 188 public ObserverInterface,
189 public rtc::MessageHandler { 189 public rtc::MessageHandler {
190 public: 190 public:
191 // We need these using declarations because there are two versions of each of
192 // the below methods and we only override one of them.
193 // TODO(deadbeef): Remove once there's only one version of the methods.
194 using PeerConnectionObserver::OnAddStream;
195 using PeerConnectionObserver::OnRemoveStream;
196 using PeerConnectionObserver::OnDataChannel;
197
191 // If |config| is not provided, uses a default constructed RTCConfiguration. 198 // If |config| is not provided, uses a default constructed RTCConfiguration.
192 static PeerConnectionTestClient* CreateClientWithDtlsIdentityStore( 199 static PeerConnectionTestClient* CreateClientWithDtlsIdentityStore(
193 const std::string& id, 200 const std::string& id,
194 const MediaConstraintsInterface* constraints, 201 const MediaConstraintsInterface* constraints,
195 const PeerConnectionFactory::Options* options, 202 const PeerConnectionFactory::Options* options,
196 const PeerConnectionInterface::RTCConfiguration* config, 203 const PeerConnectionInterface::RTCConfiguration* config,
197 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator, 204 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator,
198 bool prefer_constraint_apis, 205 bool prefer_constraint_apis,
199 rtc::Thread* network_thread, 206 rtc::Thread* network_thread,
200 rtc::Thread* worker_thread) { 207 rtc::Thread* worker_thread) {
(...skipping 2570 matching lines...)
2771 server.urls.push_back("turn:hostname2"); 2778 server.urls.push_back("turn:hostname2");
2772 servers.push_back(server); 2779 servers.push_back(server);
2773 EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_)); 2780 EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_));
2774 EXPECT_EQ(2U, turn_servers_.size()); 2781 EXPECT_EQ(2U, turn_servers_.size());
2775 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority); 2782 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority);
2776 } 2783 }
2777 2784
2778 #endif // if !defined(THREAD_SANITIZER) 2785 #endif // if !defined(THREAD_SANITIZER)
2779 2786
2780 } // namespace 2787 } // namespace
OLDNEW
« no previous file with comments | « webrtc/api/BUILD.gn ('k') | webrtc/api/peerconnectionfactory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine