Reland of "Remove the obsolete enum webrtc::PeerConnectionInterface::IceState."

webrtc/api/peerconnectioninterface.h

Index: webrtc/api/peerconnectioninterface.h
diff --git a/webrtc/api/peerconnectioninterface.h b/webrtc/api/peerconnectioninterface.h
index a04e53e2ac935f54ed5bf0398de456285a99f106..ea056bfc98fa2a39a1935a911988e3a1be35d897 100644
--- a/webrtc/api/peerconnectioninterface.h
+++ b/webrtc/api/peerconnectioninterface.h
@@ -150,19 +150,6 @@
     kHaveRemoteOffer,
     kHaveRemotePrAnswer,
     kClosed,
-  };
-
-  // TODO(bemasc): Remove IceState when callers are changed to
-  // IceConnection/GatheringState.
-  enum IceState {
-    kIceNew,
-    kIceGathering,
-    kIceWaiting,
-    kIceChecking,
-    kIceConnected,
-    kIceCompleted,
-    kIceFailed,
-    kIceClosed,
   };
 
   enum IceGatheringState {
@@ -522,14 +509,6 @@
 
   // Returns the current SignalingState.
   virtual SignalingState signaling_state() = 0;
-
-  // TODO(bemasc): Remove ice_state when callers are changed to
-  // IceConnection/GatheringState.
-  // Returns the current IceState.
-  virtual IceState ice_state() {
-      RTC_NOTREACHED();
-    return kIceNew;
-  }
   virtual IceConnectionState ice_connection_state() = 0;
   virtual IceGatheringState ice_gathering_state() = 0;