Handle any number of role conflicts; not just the first.

webrtc/p2p/base/transportcontroller_unittest.cc

Index: webrtc/p2p/base/transportcontroller_unittest.cc
diff --git a/webrtc/p2p/base/transportcontroller_unittest.cc b/webrtc/p2p/base/transportcontroller_unittest.cc
index 627975c90cad7a85275d57d0a49f49a67495a2f3..fdb99a733c6c8626f1ca803d240f49182338bdfd 100644
--- a/webrtc/p2p/base/transportcontroller_unittest.cc
+++ b/webrtc/p2p/base/transportcontroller_unittest.cc
@@ -255,6 +255,12 @@ TEST_F(TransportControllerTest, TestIceRoleConflict) {
   channel1->SignalRoleConflict(channel1);
   EXPECT_EQ(cricket::ICEROLE_CONTROLLED, channel1->GetIceRole());
   EXPECT_EQ(cricket::ICEROLE_CONTROLLED, channel2->GetIceRole());
+
+  // Should be able to handle a second role conflict. The remote endpoint can
+  // change its role/tie-breaker when it does an ICE restart.
+  channel2->SignalRoleConflict(channel2);
+  EXPECT_EQ(cricket::ICEROLE_CONTROLLING, channel1->GetIceRole());
+  EXPECT_EQ(cricket::ICEROLE_CONTROLLING, channel2->GetIceRole());
 }
 
 TEST_F(TransportControllerTest, TestGetSslRole) {