Use continual gathering to restore backup connections

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 119 matching lines @@
     channel1->SetConnectionCount(2);
     channel2->SetConnectionCount(2);
     channel1->SetReceiving(true);
     channel2->SetReceiving(true);
     channel1->SetWritable(true);
     channel2->SetWritable(true);
     channel1->SetConnectionCount(1);
     channel2->SetConnectionCount(1);
   }
 
-  cricket::IceConfig CreateIceConfig(int receiving_timeout,
-                                     bool gather_continually) {
+  cricket::IceConfig CreateIceConfig(
+      int receiving_timeout,
+      cricket::ContinualGatheringPolicy continual_gathering_policy) {
     cricket::IceConfig config;
     config.receiving_timeout = receiving_timeout;
-    config.gather_continually = gather_continually;
+    config.continual_gathering_policy = continual_gathering_policy;
     return config;
   }
 
  protected:
   void OnConnectionState(IceConnectionState state) {
     if (!signaling_thread_->IsCurrent()) {
       signaled_on_non_signaling_thread_ = true;
     }
     connection_state_ = state;
     ++connection_state_signal_count_;
@@ skipping 42 matching lines @@
 
   // Used to make sure signals only come on signaling thread.
   rtc::Thread* const signaling_thread_ = nullptr;
   bool signaled_on_non_signaling_thread_ = false;
 };
 
 TEST_F(TransportControllerTest, TestSetIceConfig) {
   FakeTransportChannel* channel1 = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel1);
 
-  transport_controller_->SetIceConfig(CreateIceConfig(1000, true));
+  transport_controller_->SetIceConfig(
+      CreateIceConfig(1000, cricket::GATHER_CONTINUALLY));
   EXPECT_EQ(1000, channel1->receiving_timeout());
   EXPECT_TRUE(channel1->gather_continually());
 
+  transport_controller_->SetIceConfig(
+      CreateIceConfig(1000, cricket::GATHER_CONTINUALLY_AND_RECOVER));
   // Test that value stored in controller is applied to new channels.
   FakeTransportChannel* channel2 = CreateChannel("video", 1);
   ASSERT_NE(nullptr, channel2);
   EXPECT_EQ(1000, channel2->receiving_timeout());
   EXPECT_TRUE(channel2->gather_continually());
 }
 
 TEST_F(TransportControllerTest, TestSetSslMaxProtocolVersion) {
   EXPECT_TRUE(transport_controller_->SetSslMaxProtocolVersion(
       rtc::SSL_PROTOCOL_DTLS_12));
@@ skipping 460 matching lines @@
   // new --> gathering --> complete
   EXPECT_EQ_WAIT(cricket::kIceGatheringComplete, gathering_state_, kTimeout);
   EXPECT_EQ(2, gathering_state_signal_count_);
 
   EXPECT_EQ_WAIT(1U, candidates_["audio"].size(), kTimeout);
   EXPECT_EQ_WAIT(1U, candidates_["video"].size(), kTimeout);
   EXPECT_EQ(2, candidates_signal_count_);
 
   EXPECT_TRUE(!signaled_on_non_signaling_thread_);
 }