commit 0462948c9cb959cc36e33d129b1d4315f55accc1
author Jonas Olsson <jonasolsson@webrtc.org> Thu Nov 15 15:02:09 2018 +0000
committer Commit Bot <commit-bot@chromium.org> Thu Nov 15 15:02:14 2018 +0000
tree 44330b434e8edad954572a25bb654152213afe0d
parent e78b465d458a329f360e1022ef4b5aa221cc4557

Revert "Add ios bindings for PeerConnectionState."

This reverts commit 586725dc9a508c7d3e82b5a625a5ee7e8b1a4e17.

Reason for revert: misses a check to see if the optional callback is implemented.

Original change's description:
> Add ios bindings for PeerConnectionState.
> 
> This change makes it possible for ios apps to use the new standards-compliant PeerConnectionState.
> 
> Bug: webrtc:9977
> Change-Id: Icf69bb1faa0383ae239cb7508f2a740a2d489697
> Reviewed-on: https://webrtc-review.googlesource.com/c/110502
> Commit-Queue: Jonas Olsson <jonasolsson@webrtc.org>
> Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#25651}

TBR=kthelgason@webrtc.org,jonasolsson@webrtc.org

Change-Id: Iff919e9876e6b8dddc6d8ab7df302081d0cfa917
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:9977
Reviewed-on: https://webrtc-review.googlesource.com/c/111062
Reviewed-by: Jonas Olsson <jonasolsson@webrtc.org>
Commit-Queue: Jonas Olsson <jonasolsson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25659}

sdk/objc/api/peerconnection/RTCPeerConnection.mm

diff --git a/sdk/objc/api/peerconnection/RTCPeerConnection.mm b/sdk/objc/api/peerconnection/RTCPeerConnection.mm
index c19562b..1ac076b 100644
--- a/sdk/objc/api/peerconnection/RTCPeerConnection.mm
+++ b/sdk/objc/api/peerconnection/RTCPeerConnection.mm
@@ -175,14 +175,11 @@
 
 void PeerConnectionDelegateAdapter::OnIceConnectionChange(
     PeerConnectionInterface::IceConnectionState new_state) {
-  RTCIceConnectionState state = [RTCPeerConnection iceConnectionStateForNativeState:new_state];
-  [peer_connection_.delegate peerConnection:peer_connection_ didChangeIceConnectionState:state];
-}
-
-void PeerConnectionDelegateAdapter::OnConnectionChange(
-    PeerConnectionInterface::PeerConnectionState new_state) {
-  RTCPeerConnectionState state = [RTCPeerConnection connectionStateForNativeState:new_state];
-  [peer_connection_.delegate peerConnection:peer_connection_ didChangeConnectionState:state];
+  RTCIceConnectionState state =
+      [[RTCPeerConnection class] iceConnectionStateForNativeState:new_state];
+  RTCPeerConnection *peer_connection = peer_connection_;
+  [peer_connection.delegate peerConnection:peer_connection
+               didChangeIceConnectionState:state];
 }
 
 void PeerConnectionDelegateAdapter::OnIceGatheringChange(
@@ -325,10 +322,6 @@
       _peerConnection->ice_connection_state()];
 }
 
-- (RTCPeerConnectionState)connectionState {
-  return [[self class] connectionStateForNativeState:_peerConnection->peer_connection_state()];
-}
-
 - (RTCIceGatheringState)iceGatheringState {
   return [[self class] iceGatheringStateForNativeState:
       _peerConnection->ice_gathering_state()];
@@ -639,59 +632,6 @@
   }
 }
 
-+ (webrtc::PeerConnectionInterface::PeerConnectionState)nativeConnectionStateForState:
-        (RTCPeerConnectionState)state {
-  switch (state) {
-    case RTCPeerConnectionStateNew:
-      return webrtc::PeerConnectionInterface::PeerConnectionState::kNew;
-    case RTCPeerConnectionStateConnecting:
-      return webrtc::PeerConnectionInterface::PeerConnectionState::kConnecting;
-    case RTCPeerConnectionStateConnected:
-      return webrtc::PeerConnectionInterface::PeerConnectionState::kConnected;
-    case RTCPeerConnectionStateFailed:
-      return webrtc::PeerConnectionInterface::PeerConnectionState::kFailed;
-    case RTCPeerConnectionStateDisconnected:
-      return webrtc::PeerConnectionInterface::PeerConnectionState::kDisconnected;
-    case RTCPeerConnectionStateClosed:
-      return webrtc::PeerConnectionInterface::PeerConnectionState::kClosed;
-  }
-}
-
-+ (RTCPeerConnectionState)connectionStateForNativeState:
-        (webrtc::PeerConnectionInterface::PeerConnectionState)nativeState {
-  switch (nativeState) {
-    case webrtc::PeerConnectionInterface::PeerConnectionState::kNew:
-      return RTCPeerConnectionStateNew;
-    case webrtc::PeerConnectionInterface::PeerConnectionState::kConnecting:
-      return RTCPeerConnectionStateConnecting;
-    case webrtc::PeerConnectionInterface::PeerConnectionState::kConnected:
-      return RTCPeerConnectionStateConnected;
-    case webrtc::PeerConnectionInterface::PeerConnectionState::kFailed:
-      return RTCPeerConnectionStateFailed;
-    case webrtc::PeerConnectionInterface::PeerConnectionState::kDisconnected:
-      return RTCPeerConnectionStateDisconnected;
-    case webrtc::PeerConnectionInterface::PeerConnectionState::kClosed:
-      return RTCPeerConnectionStateClosed;
-  }
-}
-
-+ (NSString *)stringForConnectionState:(RTCPeerConnectionState)state {
-  switch (state) {
-    case RTCPeerConnectionStateNew:
-      return @"NEW";
-    case RTCPeerConnectionStateConnecting:
-      return @"CONNECTING";
-    case RTCPeerConnectionStateConnected:
-      return @"CONNECTED";
-    case RTCPeerConnectionStateFailed:
-      return @"FAILED";
-    case RTCPeerConnectionStateDisconnected:
-      return @"DISCONNECTED";
-    case RTCPeerConnectionStateClosed:
-      return @"CLOSED";
-  }
-}
-
 + (webrtc::PeerConnectionInterface::IceConnectionState)
     nativeIceConnectionStateForState:(RTCIceConnectionState)state {
   switch (state) {