Revert of Update ICE role on all ports, not just ones used for new connections.

webrtc/p2p/base/p2ptransportchannel_unittest.cc

 /*
  *  Copyright 2009 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 2667 matching lines @@
 
   // But if a new connection created from the new session becomes writable,
   // it will stop the current session.
   ch.AddRemoteCandidate(CreateHostCandidate("2.2.2.2", 2, 100));
   cricket::Connection* conn2 = WaitForConnectionTo(&ch, "2.2.2.2", 2);
   ASSERT_TRUE(conn2 != nullptr);
   conn2->ReceivedPingResponse();  // Becomes writable and receiving
   EXPECT_TRUE(!ch.allocator_session()->IsGettingPorts());
 }
 
-// Test that the ICE role is updated even on ports with inactive networks when
-// doing continual gathering. These ports may still have connections that need
-// a correct role, in case the network becomes active before the connection is
-// destroyed.
-TEST_F(P2PTransportChannelPingTest,
-       TestIceRoleUpdatedOnPortAfterSignalNetworkInactive) {
-  cricket::FakePortAllocator pa(rtc::Thread::Current(), nullptr);
-  cricket::P2PTransportChannel ch(
-      "test channel", cricket::ICE_CANDIDATE_COMPONENT_DEFAULT, &pa);
-  // Starts with ICEROLE_CONTROLLING.
-  PrepareChannel(&ch);
-  cricket::IceConfig config = CreateIceConfig(1000, true);
-  ch.SetIceConfig(config);
-  ch.Connect();
-  ch.MaybeStartGathering();
-  ch.AddRemoteCandidate(CreateHostCandidate("1.1.1.1", 1, 1));
-
-  cricket::Connection* conn = WaitForConnectionTo(&ch, "1.1.1.1", 1);
-  ASSERT_TRUE(conn != nullptr);
-
-  // Make the fake port signal that its network is inactive, then change the
-  // ICE role and expect it to be updated.
-  conn->port()->SignalNetworkInactive(conn->port());
-  ch.SetIceRole(cricket::ICEROLE_CONTROLLED);
-  EXPECT_EQ(cricket::ICEROLE_CONTROLLED, conn->port()->GetIceRole());
-}
-
-// Test that the ICE role is updated even on ports with inactive networks.
-// These ports may still have connections that need a correct role, for the
-// pings sent by those connections until they're replaced by newer-generation
-// connections.
-TEST_F(P2PTransportChannelPingTest, TestIceRoleUpdatedOnPortAfterIceRestart) {
-  cricket::FakePortAllocator pa(rtc::Thread::Current(), nullptr);
-  cricket::P2PTransportChannel ch(
-      "test channel", cricket::ICE_CANDIDATE_COMPONENT_DEFAULT, &pa);
-  // Starts with ICEROLE_CONTROLLING.
-  PrepareChannel(&ch);
-  ch.Connect();
-  ch.MaybeStartGathering();
-  ch.AddRemoteCandidate(CreateHostCandidate("1.1.1.1", 1, 1));
-
-  cricket::Connection* conn = WaitForConnectionTo(&ch, "1.1.1.1", 1);
-  ASSERT_TRUE(conn != nullptr);
-
-  // Do an ICE restart, change the role, and expect the old port to have its
-  // role updated.
-  ch.SetIceCredentials(kIceUfrag[1], kIcePwd[1]);
-  ch.MaybeStartGathering();
-  ch.SetIceRole(cricket::ICEROLE_CONTROLLED);
-  EXPECT_EQ(cricket::ICEROLE_CONTROLLED, conn->port()->GetIceRole());
-}
-
 class P2PTransportChannelMostLikelyToWorkFirstTest
     : public P2PTransportChannelPingTest {
  public:
   P2PTransportChannelMostLikelyToWorkFirstTest()
       : turn_server_(rtc::Thread::Current(), kTurnUdpIntAddr, kTurnUdpExtAddr) {
     network_manager_.AddInterface(kPublicAddrs[0]);
     allocator_.reset(new cricket::BasicPortAllocator(
         &network_manager_, ServerAddresses(), rtc::SocketAddress(),
         rtc::SocketAddress(), rtc::SocketAddress()));
     allocator_->set_flags(allocator_->flags() |
@@ skipping 217 matching lines @@
 
   // TCP Relay/Relay is the next.
   VerifyNextPingableConnection(cricket::RELAY_PORT_TYPE,
                                cricket::RELAY_PORT_TYPE,
                                cricket::TCP_PROTOCOL_NAME);
 
   // Finally, Local/Relay will be pinged.
   VerifyNextPingableConnection(cricket::LOCAL_PORT_TYPE,
                                cricket::RELAY_PORT_TYPE);
 }