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

webrtc/p2p/base/transportcontroller.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 26 matching lines @@
   CandidatesData(const std::string& transport_name,
                  const Candidates& candidates)
       : transport_name(transport_name), candidates(candidates) {}
 
   std::string transport_name;
   Candidates candidates;
 };
 
 TransportController::TransportController(rtc::Thread* signaling_thread,
                                          rtc::Thread* network_thread,
+                                         PortAllocator* port_allocator,
+                                         bool redetermine_role_on_ice_restart)
+    : signaling_thread_(signaling_thread),
+      network_thread_(network_thread),
+      port_allocator_(port_allocator),
+      redetermine_role_on_ice_restart_(redetermine_role_on_ice_restart) {}
+
+TransportController::TransportController(rtc::Thread* signaling_thread,
+                                         rtc::Thread* network_thread,
                                          PortAllocator* port_allocator)
-    : signaling_thread_(signaling_thread),
-      network_thread_(network_thread),
-      port_allocator_(port_allocator) {}
+    : TransportController(signaling_thread,
+                          network_thread,
+                          port_allocator,
+                          true) {}
 
 TransportController::~TransportController() {
   network_thread_->Invoke<void>(
       RTC_FROM_HERE,
       rtc::Bind(&TransportController::DestroyAllTransports_n, this));
   signaling_thread_->Clear(this);
 }
 
 bool TransportController::SetSslMaxProtocolVersion(
     rtc::SSLProtocolVersion version) {
@@ skipping 380 matching lines @@
   if (!transport) {
     // If we didn't find a transport, that's not an error;
     // it could have been deleted as a result of bundling.
     // TODO(deadbeef): Make callers smarter so they won't attempt to set a
     // description on a deleted transport.
     return true;
   }
 
   // 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.
+  // so for now we can't safely stop doing this, unless the application opts in
+  // by setting |redetermine_role_on_ice_restart_| to false.
   // 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.
-  if (transport->local_description() &&
+  if (redetermine_role_on_ice_restart_ && transport->local_description() &&
       IceCredentialsChanged(transport->local_description()->ice_ufrag,
                             transport->local_description()->ice_pwd,
                             tdesc.ice_ufrag, tdesc.ice_pwd)) {
     IceRole new_ice_role =
         (action == CA_OFFER) ? ICEROLE_CONTROLLING : ICEROLE_CONTROLLED;
     SetIceRole(new_ice_role);
   }
 
   return transport->SetLocalTransportDescription(tdesc, action, err);
 }
@@ skipping 213 matching lines @@
   }
   if (gathering_state_ != new_gathering_state) {
     gathering_state_ = new_gathering_state;
     signaling_thread_->Post(
         RTC_FROM_HERE, this, MSG_ICEGATHERINGSTATE,
         new rtc::TypedMessageData<IceGatheringState>(new_gathering_state));
   }
 }
 
 }  // namespace cricket