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

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

Issue 2660223002: Add override declarations to PeerConnectionObserver subclasses, and delete obsolete methods. (Closed)
Patch Set: Created 3 years, 10 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/peerconnectioninterface_unittest.cc ('k') | no next file » | 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
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 const webrtc::MediaConstraintsInterface* constraints, 43 const webrtc::MediaConstraintsInterface* constraints,
44 const webrtc::PeerConnectionInterface::RTCConfiguration& config); 44 const webrtc::PeerConnectionInterface::RTCConfiguration& config);
45 45
46 webrtc::PeerConnectionInterface* pc() { return peer_connection_.get(); } 46 webrtc::PeerConnectionInterface* pc() { return peer_connection_.get(); }
47 47
48 rtc::scoped_refptr<webrtc::DataChannelInterface> CreateDataChannel( 48 rtc::scoped_refptr<webrtc::DataChannelInterface> CreateDataChannel(
49 const std::string& label, 49 const std::string& label,
50 const webrtc::DataChannelInit& init); 50 const webrtc::DataChannelInit& init);
51 51
52 // Implements PeerConnectionObserver. 52 // Implements PeerConnectionObserver.
53 virtual void OnSignalingChange( 53 void OnSignalingChange(
54 webrtc::PeerConnectionInterface::SignalingState new_state) {} 54 webrtc::PeerConnectionInterface::SignalingState new_state) override {}
55 virtual void OnStateChange( 55 void OnAddStream(
56 webrtc::PeerConnectionObserver::StateType state_changed) {} 56 rtc::scoped_refptr<webrtc::MediaStreamInterface> stream) override;
57 virtual void OnAddStream( 57 void OnRemoveStream(
58 rtc::scoped_refptr<webrtc::MediaStreamInterface> stream); 58 rtc::scoped_refptr<webrtc::MediaStreamInterface> stream) override {}
59 virtual void OnRemoveStream( 59 void OnDataChannel(
60 rtc::scoped_refptr<webrtc::MediaStreamInterface> stream) {} 60 rtc::scoped_refptr<webrtc::DataChannelInterface> data_channel) override ;
61 virtual void OnDataChannel( 61 void OnRenegotiationNeeded() override {}
62 rtc::scoped_refptr<webrtc::DataChannelInterface> data_channel); 62 void OnIceConnectionChange(
63 virtual void OnRenegotiationNeeded() {} 63 webrtc::PeerConnectionInterface::IceConnectionState new_state) override {}
64 virtual void OnIceConnectionChange( 64 void OnIceGatheringChange(
65 webrtc::PeerConnectionInterface::IceConnectionState new_state) {} 65 webrtc::PeerConnectionInterface::IceGatheringState new_state) override {}
66 virtual void OnIceGatheringChange( 66 void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override;
67 webrtc::PeerConnectionInterface::IceGatheringState new_state) {}
68 virtual void OnIceCandidate(const webrtc::IceCandidateInterface* candidate);
69 virtual void OnIceComplete() {}
70 67
71 // Implements CreateSessionDescriptionObserver. 68 // Implements CreateSessionDescriptionObserver.
72 virtual void OnSuccess(webrtc::SessionDescriptionInterface* desc); 69 void OnSuccess(webrtc::SessionDescriptionInterface* desc) override;
73 virtual void OnFailure(const std::string& error) {} 70 void OnFailure(const std::string& error) override {}
74 71
75 void CreateOffer(const webrtc::MediaConstraintsInterface* constraints); 72 void CreateOffer(const webrtc::MediaConstraintsInterface* constraints);
76 void CreateAnswer(const webrtc::MediaConstraintsInterface* constraints); 73 void CreateAnswer(const webrtc::MediaConstraintsInterface* constraints);
77 void ReceiveOfferSdp(const std::string& sdp); 74 void ReceiveOfferSdp(const std::string& sdp);
78 void ReceiveAnswerSdp(const std::string& sdp); 75 void ReceiveAnswerSdp(const std::string& sdp);
79 void AddIceCandidate(const std::string& sdp_mid, int sdp_mline_index, 76 void AddIceCandidate(const std::string& sdp_mid, int sdp_mline_index,
80 const std::string& candidate); 77 const std::string& candidate);
81 void WaitForCallEstablished(); 78 void WaitForCallEstablished();
82 void WaitForConnection(); 79 void WaitForConnection();
83 void WaitForAudio(); 80 void WaitForAudio();
(...skipping 25 matching lines...) Expand all
109 rtc::Thread* const network_thread_; 106 rtc::Thread* const network_thread_;
110 rtc::Thread* const worker_thread_; 107 rtc::Thread* const worker_thread_;
111 rtc::scoped_refptr<webrtc::PeerConnectionInterface> peer_connection_; 108 rtc::scoped_refptr<webrtc::PeerConnectionInterface> peer_connection_;
112 rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> 109 rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface>
113 peer_connection_factory_; 110 peer_connection_factory_;
114 rtc::scoped_refptr<FakeAudioCaptureModule> fake_audio_capture_module_; 111 rtc::scoped_refptr<FakeAudioCaptureModule> fake_audio_capture_module_;
115 std::unique_ptr<webrtc::FakeVideoTrackRenderer> renderer_; 112 std::unique_ptr<webrtc::FakeVideoTrackRenderer> renderer_;
116 }; 113 };
117 114
118 #endif // WEBRTC_PC_TEST_PEERCONNECTIONTESTWRAPPER_H_ 115 #endif // WEBRTC_PC_TEST_PEERCONNECTIONTESTWRAPPER_H_
OLDNEW
« no previous file with comments | « webrtc/pc/peerconnectioninterface_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698