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

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

Issue 2632203003: Delete deprecated PeerConnection methods, and corresponding using declarations. (Closed)
Patch Set: Make two additional methods pure virtual. 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
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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 private: 182 private:
183 bool first_packet_received_ = false; 183 bool first_packet_received_ = false;
184 cricket::MediaType expected_media_type_; 184 cricket::MediaType expected_media_type_;
185 }; 185 };
186 186
187 class PeerConnectionTestClient : public webrtc::PeerConnectionObserver, 187 class PeerConnectionTestClient : public webrtc::PeerConnectionObserver,
188 public SignalingMessageReceiver, 188 public SignalingMessageReceiver,
189 public ObserverInterface, 189 public ObserverInterface,
190 public rtc::MessageHandler { 190 public rtc::MessageHandler {
191 public: 191 public:
192 // We need these using declarations because there are two versions of each of
193 // the below methods and we only override one of them.
194 // TODO(deadbeef): Remove once there's only one version of the methods.
195 using PeerConnectionObserver::OnAddStream;
196 using PeerConnectionObserver::OnRemoveStream;
197 using PeerConnectionObserver::OnDataChannel;
198
199 // If |config| is not provided, uses a default constructed RTCConfiguration. 192 // If |config| is not provided, uses a default constructed RTCConfiguration.
200 static PeerConnectionTestClient* CreateClientWithDtlsIdentityStore( 193 static PeerConnectionTestClient* CreateClientWithDtlsIdentityStore(
201 const std::string& id, 194 const std::string& id,
202 const MediaConstraintsInterface* constraints, 195 const MediaConstraintsInterface* constraints,
203 const PeerConnectionFactory::Options* options, 196 const PeerConnectionFactory::Options* options,
204 const PeerConnectionInterface::RTCConfiguration* config, 197 const PeerConnectionInterface::RTCConfiguration* config,
205 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator, 198 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator,
206 bool prefer_constraint_apis, 199 bool prefer_constraint_apis,
207 rtc::Thread* network_thread, 200 rtc::Thread* network_thread,
208 rtc::Thread* worker_thread) { 201 rtc::Thread* worker_thread) {
(...skipping 2626 matching lines...) Expand 10 before | Expand all | Expand 10 after
2835 servers.push_back(server); 2828 servers.push_back(server);
2836 EXPECT_EQ(webrtc::RTCErrorType::NONE, 2829 EXPECT_EQ(webrtc::RTCErrorType::NONE,
2837 webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_)); 2830 webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_));
2838 EXPECT_EQ(2U, turn_servers_.size()); 2831 EXPECT_EQ(2U, turn_servers_.size());
2839 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority); 2832 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority);
2840 } 2833 }
2841 2834
2842 #endif // if !defined(THREAD_SANITIZER) 2835 #endif // if !defined(THREAD_SANITIZER)
2843 2836
2844 } // namespace 2837 } // namespace
OLDNEW
« no previous file with comments | « no previous file | webrtc/api/peerconnectionfactory_unittest.cc » ('j') | webrtc/api/peerconnectioninterface.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698