webrtc/api/test/peerconnectiontestwrapper.h - Issue 1972793003: Use scoped_refptr for On(Add|Remove)Stream and OnDataChannel.

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

Issue 1972793003: Use scoped_refptr for On(Add|Remove)Stream and OnDataChannel. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Adding "deprecated" comments. Created 4 years, 7 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/api/peerconnectioninterface_unittest.cc ('k') | webrtc/api/test/peerconnectiontestwrapper.cc » ('j') | webrtc/examples/peerconnection/client/conductor.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 24 matching lines...) Expand all Loading...
35	35

36 rtc::scoped_refptr<webrtc::DataChannelInterface> CreateDataChannel(	36 rtc::scoped_refptr<webrtc::DataChannelInterface> CreateDataChannel(

37 const std::string& label,	37 const std::string& label,

38 const webrtc::DataChannelInit& init);	38 const webrtc::DataChannelInit& init);

39	39

40 // Implements PeerConnectionObserver.	40 // Implements PeerConnectionObserver.

41 virtual void OnSignalingChange(	41 virtual void OnSignalingChange(

42 webrtc::PeerConnectionInterface::SignalingState new_state) {}	42 webrtc::PeerConnectionInterface::SignalingState new_state) {}

43 virtual void OnStateChange(	43 virtual void OnStateChange(

44 webrtc::PeerConnectionObserver::StateType state_changed) {}	44 webrtc::PeerConnectionObserver::StateType state_changed) {}

45 virtual void OnAddStream(webrtc::MediaStreamInterface* stream);	45 virtual void OnAddStream(

46 virtual void OnRemoveStream(webrtc::MediaStreamInterface* stream) {}	46 rtc::scoped_refptr<webrtc::MediaStreamInterface> stream);

47 virtual void OnDataChannel(webrtc::DataChannelInterface* data_channel);	47 virtual void OnRemoveStream(

	48 rtc::scoped_refptr<webrtc::MediaStreamInterface> stream) {}

	49 virtual void OnDataChannel(

	50 rtc::scoped_refptr<webrtc::DataChannelInterface> data_channel);

48 virtual void OnRenegotiationNeeded() {}	51 virtual void OnRenegotiationNeeded() {}

49 virtual void OnIceConnectionChange(	52 virtual void OnIceConnectionChange(

50 webrtc::PeerConnectionInterface::IceConnectionState new_state) {}	53 webrtc::PeerConnectionInterface::IceConnectionState new_state) {}

51 virtual void OnIceGatheringChange(	54 virtual void OnIceGatheringChange(

52 webrtc::PeerConnectionInterface::IceGatheringState new_state) {}	55 webrtc::PeerConnectionInterface::IceGatheringState new_state) {}

53 virtual void OnIceCandidate(const webrtc::IceCandidateInterface* candidate);	56 virtual void OnIceCandidate(const webrtc::IceCandidateInterface* candidate);

54 virtual void OnIceComplete() {}	57 virtual void OnIceComplete() {}

55	58

56 // Implements CreateSessionDescriptionObserver.	59 // Implements CreateSessionDescriptionObserver.

57 virtual void OnSuccess(webrtc::SessionDescriptionInterface* desc);	60 virtual void OnSuccess(webrtc::SessionDescriptionInterface* desc);

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
93 std::string name_;	96 std::string name_;

94 rtc::Thread* worker_thread_;	97 rtc::Thread* worker_thread_;

95 rtc::scoped_refptr<webrtc::PeerConnectionInterface> peer_connection_;	98 rtc::scoped_refptr<webrtc::PeerConnectionInterface> peer_connection_;

96 rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface>	99 rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface>

97 peer_connection_factory_;	100 peer_connection_factory_;

98 rtc::scoped_refptr<FakeAudioCaptureModule> fake_audio_capture_module_;	101 rtc::scoped_refptr<FakeAudioCaptureModule> fake_audio_capture_module_;

99 std::unique_ptr<webrtc::FakeVideoTrackRenderer> renderer_;	102 std::unique_ptr<webrtc::FakeVideoTrackRenderer> renderer_;

100 };	103 };

101	104

102 #endif // WEBRTC_API_TEST_PEERCONNECTIONTESTWRAPPER_H_	105 #endif // WEBRTC_API_TEST_PEERCONNECTIONTESTWRAPPER_H_

OLD	NEW