aboutsummaryrefslogtreecommitdiff
path: root/talk/app/webrtc/test
diff options
context:
space:
mode:
authorperkj@webrtc.org <perkj@webrtc.org>2014-11-04 11:31:29 +0000
committerperkj@webrtc.org <perkj@webrtc.org>2014-11-04 11:31:29 +0000
commitc2dd5ee2c05b466949fedae3fcfac63838104392 (patch)
tree2da69b5a4fcbcf635e62995f95e3f0f505a5a7e9 /talk/app/webrtc/test
parentf37145f685f757a978b09b76de14df3617fb2e06 (diff)
downloadwebrtc-c2dd5ee2c05b466949fedae3fcfac63838104392.tar.gz
Prepare for removal of PeerConnectionObserver::OnError.
Prepare for removal of constraints to PeerConnection::AddStream. OnError has never been implemented and has been removed from the spec. Also, constraints to PeerConnection::AddStream has also been removed from the spec and have never been implemented. R=pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/23319004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7605 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'talk/app/webrtc/test')
-rw-r--r--talk/app/webrtc/test/peerconnectiontestwrapper.cc2
-rw-r--r--talk/app/webrtc/test/peerconnectiontestwrapper.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/talk/app/webrtc/test/peerconnectiontestwrapper.cc b/talk/app/webrtc/test/peerconnectiontestwrapper.cc
index 24932b89f6..e3b801574e 100644
--- a/talk/app/webrtc/test/peerconnectiontestwrapper.cc
+++ b/talk/app/webrtc/test/peerconnectiontestwrapper.cc
@@ -253,7 +253,7 @@ void PeerConnectionTestWrapper::GetAndAddUserMedia(
bool video, const webrtc::FakeConstraints& video_constraints) {
rtc::scoped_refptr<webrtc::MediaStreamInterface> stream =
GetUserMedia(audio, audio_constraints, video, video_constraints);
- EXPECT_TRUE(peer_connection_->AddStream(stream, NULL));
+ EXPECT_TRUE(peer_connection_->AddStream(stream));
}
rtc::scoped_refptr<webrtc::MediaStreamInterface>
diff --git a/talk/app/webrtc/test/peerconnectiontestwrapper.h b/talk/app/webrtc/test/peerconnectiontestwrapper.h
index d4a0e4ecb1..d8299ec85d 100644
--- a/talk/app/webrtc/test/peerconnectiontestwrapper.h
+++ b/talk/app/webrtc/test/peerconnectiontestwrapper.h
@@ -57,7 +57,6 @@ class PeerConnectionTestWrapper
const webrtc::DataChannelInit& init);
// Implements PeerConnectionObserver.
- virtual void OnError() {}
virtual void OnSignalingChange(
webrtc::PeerConnectionInterface::SignalingState new_state) {}
virtual void OnStateChange(