Add parameter to TransportController to not change ICE role on restart.

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 671 matching lines @@
 
   EXPECT_TRUE(!signaled_on_non_signaling_thread_);
 }
 
 // Older versions of Chrome expect the ICE role to be re-determined when an
 // ICE restart occurs, and also don't perform conflict resolution correctly,
 // so for now we can't safely stop doing this.
 // See: https://bugs.chromium.org/p/chromium/issues/detail?id=628676
 // TODO(deadbeef): Remove this when these old versions of Chrome reach a low
 // enough population.
-TEST_F(TransportControllerTest, IceRoleRedeterminedOnIceRestart) {
+TEST_F(TransportControllerTest, IceRoleRedeterminedOnIceRestartByDefault) {
   FakeTransportChannel* channel = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel);
   std::string err;
   // Do an initial offer answer, so that the next offer is an ICE restart.
   transport_controller_->SetIceRole(ICEROLE_CONTROLLED);
   TransportDescription remote_desc(std::vector<std::string>(), kIceUfrag1,
                                    kIcePwd1, ICEMODE_FULL,
                                    CONNECTIONROLE_ACTPASS, nullptr);
   EXPECT_TRUE(transport_controller_->SetRemoteTransportDescription(
       "audio", remote_desc, CA_OFFER, &err));
   TransportDescription local_desc(std::vector<std::string>(), kIceUfrag2,
                                   kIcePwd2, ICEMODE_FULL,
                                   CONNECTIONROLE_ACTPASS, nullptr);
   EXPECT_TRUE(transport_controller_->SetLocalTransportDescription(
       "audio", local_desc, CA_ANSWER, &err));
   EXPECT_EQ(ICEROLE_CONTROLLED, channel->GetIceRole());
 
   // The endpoint that initiated an ICE restart should take the controlling
   // role.
   TransportDescription ice_restart_desc(std::vector<std::string>(), kIceUfrag3,
                                         kIcePwd3, ICEMODE_FULL,
                                         CONNECTIONROLE_ACTPASS, nullptr);
   EXPECT_TRUE(transport_controller_->SetLocalTransportDescription(
       "audio", ice_restart_desc, CA_OFFER, &err));
   EXPECT_EQ(ICEROLE_CONTROLLING, channel->GetIceRole());
 }
 
+// Test that if the TransportController was created with the
+// |redetermine_role_on_ice_restart| parameter set to false, the role is *not*
+// redetermined on an ICE restart.
+TEST_F(TransportControllerTest, IceRoleNotRedetermined) {
+  bool redetermine_role = false;
+  transport_controller_.reset(new TransportControllerForTest(redetermine_role));
+  FakeTransportChannel* channel = CreateChannel("audio", 1);
+  ASSERT_NE(nullptr, channel);
+  std::string err;
+  // Do an initial offer answer, so that the next offer is an ICE restart.
+  transport_controller_->SetIceRole(ICEROLE_CONTROLLED);
+  TransportDescription remote_desc(std::vector<std::string>(), kIceUfrag1,
+                                   kIcePwd1, ICEMODE_FULL,
+                                   CONNECTIONROLE_ACTPASS, nullptr);
+  EXPECT_TRUE(transport_controller_->SetRemoteTransportDescription(
+      "audio", remote_desc, CA_OFFER, &err));
+  TransportDescription local_desc(std::vector<std::string>(), kIceUfrag2,
+                                  kIcePwd2, ICEMODE_FULL,
+                                  CONNECTIONROLE_ACTPASS, nullptr);
+  EXPECT_TRUE(transport_controller_->SetLocalTransportDescription(
+      "audio", local_desc, CA_ANSWER, &err));
+  EXPECT_EQ(ICEROLE_CONTROLLED, channel->GetIceRole());
+
+  // The endpoint that initiated an ICE restart should take the controlling

[skvlad, 2016/08/26 23:02:35]

"should keep the previous role"?

[Taylor Brandstetter, 2016/08/26 23:13:03]

Good catch.

+  // role.
+  TransportDescription ice_restart_desc(std::vector<std::string>(), kIceUfrag3,
+                                        kIcePwd3, ICEMODE_FULL,
+                                        CONNECTIONROLE_ACTPASS, nullptr);
+  EXPECT_TRUE(transport_controller_->SetLocalTransportDescription(
+      "audio", ice_restart_desc, CA_OFFER, &err));
+  EXPECT_EQ(ICEROLE_CONTROLLED, channel->GetIceRole());
+}
+
 }  // namespace cricket {