| Index: content/renderer/media/mock_media_stream_dependency_factory.h
|
| diff --git a/content/renderer/media/mock_media_stream_dependency_factory.h b/content/renderer/media/mock_media_stream_dependency_factory.h
|
| index 39d0a34f2cb6120089b85331e5107bb613aa8166..59b89179b44baf13d1f206b6b77c50b92ca7845b 100644
|
| --- a/content/renderer/media/mock_media_stream_dependency_factory.h
|
| +++ b/content/renderer/media/mock_media_stream_dependency_factory.h
|
| @@ -73,22 +73,26 @@ class MockMediaStreamDependencyFactory : public MediaStreamDependencyFactory {
|
| MockMediaStreamDependencyFactory();
|
| virtual ~MockMediaStreamDependencyFactory();
|
|
|
| - virtual talk_base::scoped_refptr<webrtc::PeerConnectionInterface>
|
| - CreatePeerConnection(
|
| - const std::string& config,
|
| - webrtc::PeerConnectionObserver* observer) OVERRIDE;
|
| - virtual talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface>
|
| + virtual scoped_refptr<webrtc::PeerConnectionInterface>
|
| + CreatePeerConnection(const std::string& config,
|
| + webrtc::PeerConnectionObserver* observer) OVERRIDE;
|
| + virtual scoped_refptr<webrtc::PeerConnectionInterface>
|
| + CreatePeerConnection(const webrtc::JsepInterface::IceServers& ice_servers,
|
| + const webrtc::MediaConstraintsInterface* constraints,
|
| + webrtc::PeerConnectionObserver* observer) OVERRIDE;
|
| + virtual scoped_refptr<webrtc::LocalMediaStreamInterface>
|
| CreateLocalMediaStream(const std::string& label) OVERRIDE;
|
| - virtual talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface>
|
| - CreateLocalVideoTrack(
|
| - const std::string& label,
|
| - int video_session_id) OVERRIDE;
|
| - virtual talk_base::scoped_refptr<webrtc::LocalAudioTrackInterface>
|
| - CreateLocalAudioTrack(
|
| - const std::string& label,
|
| - webrtc::AudioDeviceModule* audio_device) OVERRIDE;
|
| + virtual scoped_refptr<webrtc::LocalVideoTrackInterface>
|
| + CreateLocalVideoTrack(const std::string& label,
|
| + int video_session_id) OVERRIDE;
|
| + virtual scoped_refptr<webrtc::LocalAudioTrackInterface>
|
| + CreateLocalAudioTrack(const std::string& label,
|
| + webrtc::AudioDeviceModule* audio_device) OVERRIDE;
|
| virtual webrtc::SessionDescriptionInterface* CreateSessionDescription(
|
| const std::string& sdp) OVERRIDE;
|
| + virtual webrtc::SessionDescriptionInterface* CreateSessionDescription(
|
| + const std::string& type,
|
| + const std::string& sdp) OVERRIDE;
|
| virtual webrtc::IceCandidateInterface* CreateIceCandidate(
|
| const std::string& sdp_mid,
|
| int sdp_mline_index,
|
|
|