Don't re-determine ICE role on an ICE restart.

webrtc/p2p/base/transport.cc

Index: webrtc/p2p/base/transport.cc
diff --git a/webrtc/p2p/base/transport.cc b/webrtc/p2p/base/transport.cc
index 9688e4aedcdf125a38802571c4e24908a9dc285b..33c52776ada4403d375b506a90059d91f6962518 100644
--- a/webrtc/p2p/base/transport.cc
+++ b/webrtc/p2p/base/transport.cc
@@ -58,12 +58,6 @@ bool IceCredentialsChanged(const std::string& old_ufrag,
   return (old_ufrag != new_ufrag) || (old_pwd != new_pwd);
 }
 
-static bool IceCredentialsChanged(const TransportDescription& old_desc,
-                                  const TransportDescription& new_desc) {
-  return IceCredentialsChanged(old_desc.ice_ufrag, old_desc.ice_pwd,
-                               new_desc.ice_ufrag, new_desc.ice_pwd);
-}
-
 Transport::Transport(const std::string& name, PortAllocator* allocator)
     : name_(name), allocator_(allocator) {}
 
@@ -105,16 +99,6 @@ bool Transport::SetLocalTransportDescription(
                                    error_desc);
   }
 
-  if (local_description_ &&
-      IceCredentialsChanged(*local_description_, description)) {
-    IceRole new_ice_role =
-        (action == CA_OFFER) ? ICEROLE_CONTROLLING : ICEROLE_CONTROLLED;
-
-    // It must be called before ApplyLocalTransportDescription, which may
-    // trigger an ICE restart and depends on the new ICE role.
-    SetIceRole(new_ice_role);
-  }
-
   local_description_.reset(new TransportDescription(description));
 
   for (const auto& kv : channels_) {