Use continual gathering to restore backup connections

webrtc/api/webrtcsession.cc

 /*
  *  Copyright 2012 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 1110 matching lines @@
   std::string error;
   bool res = transport_controller_->RemoveRemoteCandidates(candidates, &error);
   if (!res && !error.empty()) {
     LOG(LS_ERROR) << "Error when removing remote candidates: " << error;
   }
   return true;
 }
 
 cricket::IceConfig WebRtcSession::ParseIceConfig(
     const PeerConnectionInterface::RTCConfiguration& config) const {
-  cricket::IceConfig ice_config;
-  ice_config.receiving_timeout = config.ice_connection_receiving_timeout;
-  ice_config.prioritize_most_likely_candidate_pairs =
-      config.prioritize_most_likely_ice_candidate_pairs;
-  ice_config.backup_connection_ping_interval =
-      config.ice_backup_candidate_pair_ping_interval;
-  ice_config.gather_continually = (config.continual_gathering_policy ==
-                                   PeerConnectionInterface::GATHER_CONTINUALLY);
-  return ice_config;
+  ContinualGatheringPolicy gathering_policy;
+  switch (config.continual_gathering_policy) {
+    case PeerConnectionInterface::GATHER_ONCE:
+      gathering_policy = GATHER_ONCE;
+      break;
+    case PeerConnectionInterface::GATHER_CONTINUALLY:
+      gathering_policy = GATHER_CONTINUALLY;
+      break;
+    default:
+      RTC_DCHECK(false);
+      gathering_policy = GATHER_ONCE;
+  }
+  return ContinualGatheringPolicy(
+      config.ice_connection_receiving_timeout,
+      config.ice_backup_candidate_pair_ping_interval, gathering_policy,
+      config.prioritize_most_likely_ice_candidate_pairs,
+      -1 /* max_strong_interval_ms */);
 }
 
 void WebRtcSession::SetIceConfig(const cricket::IceConfig& config) {
   transport_controller_->SetIceConfig(config);
 }
 
 void WebRtcSession::MaybeStartGathering() {
   transport_controller_->MaybeStartGathering();
 }
 
@@ skipping 1011 matching lines @@
                                                   ssl_cipher_suite);
   }
 }
 
 void WebRtcSession::OnSentPacket_w(const rtc::SentPacket& sent_packet) {
   RTC_DCHECK(worker_thread()->IsCurrent());
   media_controller_->call_w()->OnSentPacket(sent_packet);
 }
 
 }  // namespace webrtc