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

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

Issue 2632203003: Delete deprecated PeerConnection methods, and corresponding using declarations. (Closed)
Patch Set: Rebase. 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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 private: 176 private:
177 bool first_packet_received_ = false; 177 bool first_packet_received_ = false;
178 cricket::MediaType expected_media_type_; 178 cricket::MediaType expected_media_type_;
179 }; 179 };
180 180
181 class PeerConnectionTestClient : public webrtc::PeerConnectionObserver, 181 class PeerConnectionTestClient : public webrtc::PeerConnectionObserver,
182 public SignalingMessageReceiver, 182 public SignalingMessageReceiver,
183 public ObserverInterface, 183 public ObserverInterface,
184 public rtc::MessageHandler { 184 public rtc::MessageHandler {
185 public: 185 public:
186 // We need these using declarations because there are two versions of each of
187 // the below methods and we only override one of them.
188 // TODO(deadbeef): Remove once there's only one version of the methods.
189 using PeerConnectionObserver::OnAddStream;
190 using PeerConnectionObserver::OnRemoveStream;
191 using PeerConnectionObserver::OnDataChannel;
192
193 // If |config| is not provided, uses a default constructed RTCConfiguration. 186 // If |config| is not provided, uses a default constructed RTCConfiguration.
194 static PeerConnectionTestClient* CreateClientWithDtlsIdentityStore( 187 static PeerConnectionTestClient* CreateClientWithDtlsIdentityStore(
195 const std::string& id, 188 const std::string& id,
196 const MediaConstraintsInterface* constraints, 189 const MediaConstraintsInterface* constraints,
197 const PeerConnectionFactory::Options* options, 190 const PeerConnectionFactory::Options* options,
198 const PeerConnectionInterface::RTCConfiguration* config, 191 const PeerConnectionInterface::RTCConfiguration* config,
199 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator, 192 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator,
200 bool prefer_constraint_apis, 193 bool prefer_constraint_apis,
201 rtc::Thread* network_thread, 194 rtc::Thread* network_thread,
202 rtc::Thread* worker_thread) { 195 rtc::Thread* worker_thread) {
(...skipping 2616 matching lines...) Expand 10 before | Expand all | Expand 10 after
2819 servers.push_back(server); 2812 servers.push_back(server);
2820 EXPECT_EQ(webrtc::RTCErrorType::NONE, 2813 EXPECT_EQ(webrtc::RTCErrorType::NONE,
2821 webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_)); 2814 webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_));
2822 EXPECT_EQ(2U, turn_servers_.size()); 2815 EXPECT_EQ(2U, turn_servers_.size());
2823 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority); 2816 EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority);
2824 } 2817 }
2825 2818
2826 #endif // if !defined(THREAD_SANITIZER) 2819 #endif // if !defined(THREAD_SANITIZER)
2827 2820
2828 } // namespace 2821 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698