Remove deprecated PeerConnection APIs.
Removes PeerConnectionObserver::OnError.
Removes MediaConstraints argument to PeerConnection::AddStream.
None of these have ever been implemented and have been removed from the spec.
R=tommi@chromium.org
Review URL: https://webrtc-codereview.appspot.com/24189004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7650 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/app/webrtc/peerconnection.cc b/talk/app/webrtc/peerconnection.cc
index b64caf7..64ddcad 100644
--- a/talk/app/webrtc/peerconnection.cc
+++ b/talk/app/webrtc/peerconnection.cc
@@ -420,11 +420,6 @@
return true;
}
-bool PeerConnection::AddStream(MediaStreamInterface* local_stream,
- const MediaConstraintsInterface* constraints) {
- return AddStream(local_stream);
-}
-
void PeerConnection::RemoveStream(MediaStreamInterface* local_stream) {
mediastream_signaling_->RemoveLocalStream(local_stream);
if (IsClosed()) {
diff --git a/talk/app/webrtc/peerconnection.h b/talk/app/webrtc/peerconnection.h
index 355211c..68aa154 100644
--- a/talk/app/webrtc/peerconnection.h
+++ b/talk/app/webrtc/peerconnection.h
@@ -66,8 +66,6 @@
virtual rtc::scoped_refptr<StreamCollectionInterface> local_streams();
virtual rtc::scoped_refptr<StreamCollectionInterface> remote_streams();
virtual bool AddStream(MediaStreamInterface* local_stream);
- virtual bool AddStream(MediaStreamInterface* local_stream,
- const MediaConstraintsInterface* constraints);
virtual void RemoveStream(MediaStreamInterface* local_stream);
virtual rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender(
diff --git a/talk/app/webrtc/peerconnectioninterface.h b/talk/app/webrtc/peerconnectioninterface.h
index 68b7879..73a4812 100644
--- a/talk/app/webrtc/peerconnectioninterface.h
+++ b/talk/app/webrtc/peerconnectioninterface.h
@@ -255,15 +255,7 @@
// Add a new MediaStream to be sent on this PeerConnection.
// Note that a SessionDescription negotiation is needed before the
// remote peer can receive the stream.
- // TODO(perkj): Make pure virtual once Chrome mocks have implemented.
- virtual bool AddStream(MediaStreamInterface* stream) { return false;}
-
- // Deprecated:
- // TODO(perkj): Remove once its not used by Chrome.
- virtual bool AddStream(MediaStreamInterface* stream,
- const MediaConstraintsInterface* constraints) {
- return false;
- }
+ virtual bool AddStream(MediaStreamInterface* stream) = 0;
// Remove a MediaStream from this PeerConnection.
// Note that a SessionDescription negotiation is need before the
@@ -351,10 +343,6 @@
kIceState,
};
- // Deprecated.
- // TODO(perkj): Remove once its not used by Chrome.
- virtual void OnError() {}
-
// Triggered when the SignalingState changed.
virtual void OnSignalingChange(
PeerConnectionInterface::SignalingState new_state) {}
diff --git a/talk/app/webrtc/peerconnectionproxy.h b/talk/app/webrtc/peerconnectionproxy.h
index 571c676..852d852 100644
--- a/talk/app/webrtc/peerconnectionproxy.h
+++ b/talk/app/webrtc/peerconnectionproxy.h
@@ -40,8 +40,6 @@
PROXY_METHOD0(rtc::scoped_refptr<StreamCollectionInterface>,
remote_streams)
PROXY_METHOD1(bool, AddStream, MediaStreamInterface*)
- PROXY_METHOD2(bool, AddStream, MediaStreamInterface*,
- const MediaConstraintsInterface*);
PROXY_METHOD1(void, RemoveStream, MediaStreamInterface*)
PROXY_METHOD1(rtc::scoped_refptr<DtmfSenderInterface>,
CreateDtmfSender, AudioTrackInterface*)
