Fixing bug that results in incorrect ICE role with ICE lite endpoints.

webrtc/p2p/base/transportcontroller_unittest.cc

 /*
  *  Copyright 2015 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 816 matching lines @@
                                    kIcePwd1, ICEMODE_LITE, CONNECTIONROLE_NONE,
                                    nullptr);
   ASSERT_TRUE(transport_controller_->SetRemoteTransportDescription(
       "audio", remote_desc, CA_ANSWER, nullptr));
   EXPECT_EQ(ICEROLE_CONTROLLING, transport->fake_ice_transport()->GetIceRole());
   // After receiving remote description with ICEMODE_LITE, transport should
   // have mode set to ICEMODE_LITE.
   EXPECT_EQ(ICEMODE_LITE, transport->fake_ice_transport()->remote_ice_mode());
 }
 
+// Tests that the ICE role remains "controlling" if a subsequent offer that
+// does an ICE restart is received from an ICE lite endpoint. Regression test
+// for: https://crbug.com/710760
+TEST_F(TransportControllerTest,
+       IceRoleIsControllingAfterIceRestartFromIceLiteEndpoint) {
+  FakeDtlsTransport* transport = CreateFakeDtlsTransport("audio", 1);
+  ASSERT_NE(nullptr, transport);
+  std::string err;
+
+  // Initial offer/answer.
+  TransportDescription remote_desc(std::vector<std::string>(), kIceUfrag1,
+                                   kIcePwd1, ICEMODE_LITE,
+                                   CONNECTIONROLE_ACTPASS, nullptr);
+  TransportDescription local_desc(kIceUfrag1, kIcePwd1);
+  ASSERT_TRUE(transport_controller_->SetRemoteTransportDescription(
+      "audio", remote_desc, CA_OFFER, &err));
+  ASSERT_TRUE(transport_controller_->SetLocalTransportDescription(
+      "audio", local_desc, CA_ANSWER, nullptr));
+  // Subsequent ICE restart offer/answer.
+  remote_desc.ice_ufrag = kIceUfrag2;
+  remote_desc.ice_pwd = kIcePwd2;
+  local_desc.ice_ufrag = kIceUfrag2;
+  local_desc.ice_pwd = kIcePwd2;
+  ASSERT_TRUE(transport_controller_->SetRemoteTransportDescription(
+      "audio", remote_desc, CA_OFFER, &err));
+  ASSERT_TRUE(transport_controller_->SetLocalTransportDescription(
+      "audio", local_desc, CA_ANSWER, nullptr));
+
+  EXPECT_EQ(ICEROLE_CONTROLLING, transport->fake_ice_transport()->GetIceRole());
+}
+
 // Tests SetNeedsIceRestartFlag and NeedsIceRestart, setting the flag and then
 // initiating an ICE restart for one of the transports.
 TEST_F(TransportControllerTest, NeedsIceRestart) {
   CreateFakeDtlsTransport("audio", 1);
   CreateFakeDtlsTransport("video", 1);
 
   // Do initial offer/answer so there's something to restart.
   TransportDescription local_desc(kIceUfrag1, kIcePwd1);
   TransportDescription remote_desc(kIceUfrag1, kIcePwd1);
   ASSERT_TRUE(transport_controller_->SetLocalTransportDescription(
@@ skipping 22 matching lines @@
   ASSERT_TRUE(transport_controller_->SetLocalTransportDescription(
       "audio", ice_restart_local_desc, CA_OFFER, nullptr));
   ASSERT_TRUE(transport_controller_->SetLocalTransportDescription(
       "video", local_desc, CA_OFFER, nullptr));
   // NeedsIceRestart should still be true for video.
   EXPECT_FALSE(transport_controller_->NeedsIceRestart("audio"));
   EXPECT_TRUE(transport_controller_->NeedsIceRestart("video"));
 }
 
 }  // namespace cricket {