Implement the "needs-ice-restart" logic for SetConfiguration.

webrtc/p2p/base/transportcontroller.h

Index: webrtc/p2p/base/transportcontroller.h
diff --git a/webrtc/p2p/base/transportcontroller.h b/webrtc/p2p/base/transportcontroller.h
index cdac4b6dcb5e72a08761a593b02d2f5fae9812c5..3241ffba08f7444d95d23b7ec003b9f8217bf350 100644
--- a/webrtc/p2p/base/transportcontroller.h
+++ b/webrtc/p2p/base/transportcontroller.h
@@ -64,6 +64,13 @@ class TransportController : public sigslot::has_slots<>,
   void SetIceConfig(const IceConfig& config);
   void SetIceRole(IceRole ice_role);
 
+  // Set the "needs-ice-restart" flag as described in JSEP.
+  void SetNeedsIceRestartFlag();
+  // Returns true if the ICE restart flag above was set, and no ICE restart has
+  // occurred yet for |transport_name|. If the transport has been deleted as a
+  // result of bundling, returns false.
+  bool NeedsIceRestart(const std::string& transport_name) const;
+
   bool GetSslRole(const std::string& transport_name, rtc::SSLRole* role) const;
 
   // Specifies the identity to use in this session.
@@ -197,21 +204,21 @@ class TransportController : public sigslot::has_slots<>,
 
   // Helper functions to get a channel or transport, or iterator to it (in case
   // it needs to be erased).
-  std::vector<RefCountedChannel>::iterator GetChannelIterator_n(
+  std::vector<RefCountedChannel>::iterator GetChannel_nIterator_n(
       const std::string& transport_name,
       int component);
-  std::vector<RefCountedChannel>::const_iterator GetChannelIterator_n(
+  std::vector<RefCountedChannel>::const_iterator GetChannel_nIterator_n(
       const std::string& transport_name,
       int component) const;
-  const JsepTransport* GetJsepTransport_n(
+  const JsepTransport* GetJsepTransport(
       const std::string& transport_name) const;
-  JsepTransport* GetJsepTransport_n(const std::string& transport_name);
+  JsepTransport* GetJsepTransport(const std::string& transport_name);
   const RefCountedChannel* GetChannel_n(const std::string& transport_name,
                                         int component) const;
   RefCountedChannel* GetChannel_n(const std::string& transport_name,
                                   int component);
 
-  JsepTransport* GetOrCreateJsepTransport_n(const std::string& transport_name);
+  JsepTransport* GetOrCreateJsepTransport(const std::string& transport_name);
   void DestroyAllChannels_n();
 
   bool SetSslMaxProtocolVersion_n(rtc::SSLProtocolVersion version);