From e7c338fed4dfbcd2174edfe9e99d3e9fa800602e Mon Sep 17 00:00:00 2001
From: sprang <sprang@webrtc.org>
Date: Tue, 11 Oct 2016 09:04:43 -0700
Subject: [PATCH] Reland of "Remove the obsolete enum
 webrtc::PeerConnectionInterface::IceState." (patchset #1 id:1 of
 https://codereview.webrtc.org/2402993002/ )

Reason for revert:
Upstream fixes landed.

Original issue's description:
> Revert of "Remove the obsolete enum webrtc::PeerConnectionInterface::IceState." (patchset #1 id:1 of https://codereview.webrtc.org/2361053003/ )
>
> Reason for revert:
> Breaks upstream code.
>
> Original issue's description:
> > Reland of "Remove the obsolete enum webrtc::PeerConnectionInterface::IceState."
> >
> > Original commit https://codereview.webrtc.org/2256663002
> > was reverted by https://codereview.webrtc.org/2290963002 .
> >
> > BUG=webrtc:6299
> > TBR=pthatcher@webrtc.org
> >
> > Committed: https://crrev.com/fc9414ab513941028309d15a2baf711ef38f93a7
> > Cr-Commit-Position: refs/heads/master@{#14584}
>
> TBR=pthatcher@webrtc.org,johan@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:6299
>
> Committed: https://crrev.com/57cb873707fbcc4864f0ee98129f73e7bef26c1a
> Cr-Commit-Position: refs/heads/master@{#14586}

TBR=pthatcher@webrtc.org,johan@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:6299

Review-Url: https://codereview.webrtc.org/2411673005
Cr-Commit-Position: refs/heads/master@{#14602}
---
 webrtc/api/peerconnection.cc         |  5 -----
 webrtc/api/peerconnection.h          |  4 ----
 webrtc/api/peerconnectioninterface.h | 21 ---------------------
 webrtc/api/peerconnectionproxy.h     |  1 -
 4 files changed, 31 deletions(-)

diff --git a/webrtc/api/peerconnection.cc b/webrtc/api/peerconnection.cc
index dd99e36b3d..830c301a6d 100644
--- a/webrtc/api/peerconnection.cc
+++ b/webrtc/api/peerconnection.cc
@@ -570,7 +570,6 @@ PeerConnection::PeerConnection(PeerConnectionFactory* factory)
       observer_(NULL),
       uma_observer_(NULL),
       signaling_state_(kStable),
-      ice_state_(kIceNew),
       ice_connection_state_(kIceConnectionNew),
       ice_gathering_state_(kIceGatheringNew),
       event_log_(RtcEventLog::Create(webrtc::Clock::GetRealTimeClock())),
@@ -901,10 +900,6 @@ PeerConnectionInterface::SignalingState PeerConnection::signaling_state() {
   return signaling_state_;
 }
 
-PeerConnectionInterface::IceState PeerConnection::ice_state() {
-  return ice_state_;
-}
-
 PeerConnectionInterface::IceConnectionState
 PeerConnection::ice_connection_state() {
   return ice_connection_state_;
diff --git a/webrtc/api/peerconnection.h b/webrtc/api/peerconnection.h
index f5b0af8c42..740958528d 100644
--- a/webrtc/api/peerconnection.h
+++ b/webrtc/api/peerconnection.h
@@ -108,8 +108,6 @@ class PeerConnection : public PeerConnectionInterface,
 
   SignalingState signaling_state() override;
 
-  // TODO(bemasc): Remove ice_state() when callers are removed.
-  IceState ice_state() override;
   IceConnectionState ice_connection_state() override;
   IceGatheringState ice_gathering_state() override;
 
@@ -387,8 +385,6 @@ class PeerConnection : public PeerConnectionInterface,
   PeerConnectionObserver* observer_;
   UMAObserver* uma_observer_;
   SignalingState signaling_state_;
-  // TODO(bemasc): Remove ice_state_.
-  IceState ice_state_;
   IceConnectionState ice_connection_state_;
   IceGatheringState ice_gathering_state_;
 
diff --git a/webrtc/api/peerconnectioninterface.h b/webrtc/api/peerconnectioninterface.h
index a04e53e2ac..ea056bfc98 100644
--- a/webrtc/api/peerconnectioninterface.h
+++ b/webrtc/api/peerconnectioninterface.h
@@ -152,19 +152,6 @@ class PeerConnectionInterface : public rtc::RefCountInterface {
     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,
@@ -522,14 +509,6 @@ class PeerConnectionInterface : public rtc::RefCountInterface {
 
   // 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;
 
diff --git a/webrtc/api/peerconnectionproxy.h b/webrtc/api/peerconnectionproxy.h
index 8c15b3d79f..8cd3a48e50 100644
--- a/webrtc/api/peerconnectionproxy.h
+++ b/webrtc/api/peerconnectionproxy.h
@@ -72,7 +72,6 @@ BEGIN_SIGNALING_PROXY_MAP(PeerConnection)
                 const std::vector<cricket::Candidate>&);
   PROXY_METHOD1(void, RegisterUMAObserver, UMAObserver*)
   PROXY_METHOD0(SignalingState, signaling_state)
-  PROXY_METHOD0(IceState, ice_state)
   PROXY_METHOD0(IceConnectionState, ice_connection_state)
   PROXY_METHOD0(IceGatheringState, ice_gathering_state)
   PROXY_METHOD2(bool, StartRtcEventLog, rtc::PlatformFile, int64_t)