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

webrtc/api/peerconnectioninterface.h

 /*
  *  Copyright 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 134 matching lines @@
   // See http://dev.w3.org/2011/webrtc/editor/webrtc.html#state-definitions .
   enum SignalingState {
     kStable,
     kHaveLocalOffer,
     kHaveLocalPrAnswer,
     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 {
     kIceGatheringNew,
     kIceGatheringGathering,
     kIceGatheringComplete
   };
 
   enum IceConnectionState {
     kIceConnectionNew,
     kIceConnectionChecking,
     kIceConnectionConnected,
@@ skipping 337 matching lines @@
   // Removes a group of remote candidates from the ICE agent.
   virtual bool RemoveIceCandidates(
       const std::vector<cricket::Candidate>& candidates) {
     return false;
   }
 
   virtual void RegisterUMAObserver(UMAObserver* observer) = 0;
 
   // 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;
 
   // Starts RtcEventLog using existing file. Takes ownership of |file| and
   // passes it on to Call, which will take the ownership. If the
   // operation fails the file will be closed. The logging will stop
   // automatically after 10 minutes have passed, or when the StopRtcEventLog
   // function is called.
   // TODO(ivoc): Make this pure virtual when Chrome is updated.
   virtual bool StartRtcEventLog(rtc::PlatformFile file,
@@ skipping 235 matching lines @@
     cricket::WebRtcVideoEncoderFactory* encoder_factory,
     cricket::WebRtcVideoDecoderFactory* decoder_factory) {
   return CreatePeerConnectionFactory(
       worker_and_network_thread, worker_and_network_thread, signaling_thread,
       default_adm, encoder_factory, decoder_factory);
 }
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_API_PEERCONNECTIONINTERFACE_H_