Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1950)

Unified Diff: webrtc/p2p/base/transportcontroller_unittest.cc

Issue 2025573002: Use continual gathering to restore backup connections (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Merge branch 'master' into enhanced_cg Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/p2p/base/transportcontroller_unittest.cc
diff --git a/webrtc/p2p/base/transportcontroller_unittest.cc b/webrtc/p2p/base/transportcontroller_unittest.cc
index 4ca481f241f192a051a72d4f72f20b0988b6698e..8c1dd559b2924cd90e8840240842f7ca20dfedf4 100644
--- a/webrtc/p2p/base/transportcontroller_unittest.cc
+++ b/webrtc/p2p/base/transportcontroller_unittest.cc
@@ -137,11 +137,12 @@ class TransportControllerTest : public testing::Test,
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;
}
@@ -204,10 +205,13 @@ 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);

Powered by Google App Engine
This is Rietveld 408576698