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

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

Issue 2632203003: Delete deprecated PeerConnection methods, and corresponding using declarations. (Closed)
Patch Set: Rebased. Created 3 years, 9 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
« no previous file with comments | « webrtc/pc/peerconnection_unittest.cc ('k') | webrtc/pc/peerconnectioninterface_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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 static const char kStunIceServerWithIPv4Address[] = "stun:1.2.3.4:1234"; 56 static const char kStunIceServerWithIPv4Address[] = "stun:1.2.3.4:1234";
57 static const char kStunIceServerWithIPv4AddressWithoutPort[] = "stun:1.2.3.4"; 57 static const char kStunIceServerWithIPv4AddressWithoutPort[] = "stun:1.2.3.4";
58 static const char kStunIceServerWithIPv6Address[] = "stun:[2401:fa00:4::]:1234"; 58 static const char kStunIceServerWithIPv6Address[] = "stun:[2401:fa00:4::]:1234";
59 static const char kStunIceServerWithIPv6AddressWithoutPort[] = 59 static const char kStunIceServerWithIPv6AddressWithoutPort[] =
60 "stun:[2401:fa00:4::]"; 60 "stun:[2401:fa00:4::]";
61 static const char kTurnIceServerWithIPv6Address[] = 61 static const char kTurnIceServerWithIPv6Address[] =
62 "turn:test@[2401:fa00:4::]:1234"; 62 "turn:test@[2401:fa00:4::]:1234";
63 63
64 class NullPeerConnectionObserver : public PeerConnectionObserver { 64 class NullPeerConnectionObserver : public PeerConnectionObserver {
65 public: 65 public:
66 // We need these using declarations because there are two versions of each of
67 // the below methods and we only override one of them.
68 // TODO(deadbeef): Remove once there's only one version of the methods.
69 using PeerConnectionObserver::OnAddStream;
70 using PeerConnectionObserver::OnRemoveStream;
71 using PeerConnectionObserver::OnDataChannel;
72
73 virtual ~NullPeerConnectionObserver() = default; 66 virtual ~NullPeerConnectionObserver() = default;
74 void OnSignalingChange( 67 void OnSignalingChange(
75 PeerConnectionInterface::SignalingState new_state) override {} 68 PeerConnectionInterface::SignalingState new_state) override {}
76 void OnAddStream(rtc::scoped_refptr<MediaStreamInterface> stream) override {} 69 void OnAddStream(rtc::scoped_refptr<MediaStreamInterface> stream) override {}
77 void OnRemoveStream( 70 void OnRemoveStream(
78 rtc::scoped_refptr<MediaStreamInterface> stream) override {} 71 rtc::scoped_refptr<MediaStreamInterface> stream) override {}
79 void OnDataChannel( 72 void OnDataChannel(
80 rtc::scoped_refptr<DataChannelInterface> data_channel) override {} 73 rtc::scoped_refptr<DataChannelInterface> data_channel) override {}
81 void OnRenegotiationNeeded() override {} 74 void OnRenegotiationNeeded() override {}
82 void OnIceConnectionChange( 75 void OnIceConnectionChange(
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 track->set_enabled(false); 348 track->set_enabled(false);
356 EXPECT_TRUE(capturer->CaptureFrame()); 349 EXPECT_TRUE(capturer->CaptureFrame());
357 EXPECT_EQ(2, local_renderer.num_rendered_frames()); 350 EXPECT_EQ(2, local_renderer.num_rendered_frames());
358 EXPECT_TRUE(local_renderer.black_frame()); 351 EXPECT_TRUE(local_renderer.black_frame());
359 352
360 track->set_enabled(true); 353 track->set_enabled(true);
361 EXPECT_TRUE(capturer->CaptureFrame()); 354 EXPECT_TRUE(capturer->CaptureFrame());
362 EXPECT_EQ(3, local_renderer.num_rendered_frames()); 355 EXPECT_EQ(3, local_renderer.num_rendered_frames());
363 EXPECT_FALSE(local_renderer.black_frame()); 356 EXPECT_FALSE(local_renderer.black_frame());
364 } 357 }
OLDNEW
« no previous file with comments | « webrtc/pc/peerconnection_unittest.cc ('k') | webrtc/pc/peerconnectioninterface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698