| Index: content/renderer/media/webrtc/stun_field_trial_unittest.cc
|
| diff --git a/content/renderer/media/webrtc/stun_field_trial_unittest.cc b/content/renderer/media/webrtc/stun_field_trial_unittest.cc
|
| index b59b768d63cee6b3ef830b212423c821ff731d33..75808bd9d3d5b989b40d3e80cb8df2e6be2107db 100644
|
| --- a/content/renderer/media/webrtc/stun_field_trial_unittest.cc
|
| +++ b/content/renderer/media/webrtc/stun_field_trial_unittest.cc
|
| @@ -14,30 +14,39 @@ TEST(StunProbeTrial, VerifyParameterParsing) {
|
| int requests_per_ip;
|
| int interval_ms;
|
| int shared_socket_mode;
|
| + int batch_size;
|
| + int total_batches;
|
| std::string params;
|
|
|
| - params = "20/500/1/server:3478/server2:3478";
|
| - EXPECT_TRUE(ParseStunProbeParameters(params, &requests_per_ip, &interval_ms,
|
| - &shared_socket_mode, &servers));
|
| + params = "20/500/1/3/3/server:3478/server2:3478";
|
| + EXPECT_TRUE(StunProberTrial::ParseParameters(
|
| + params, &requests_per_ip, &interval_ms, &shared_socket_mode, &batch_size,
|
| + &total_batches, &servers));
|
| EXPECT_EQ(requests_per_ip, 20);
|
| EXPECT_EQ(interval_ms, 100);
|
| EXPECT_EQ(shared_socket_mode, 1);
|
| EXPECT_EQ(servers.size(), 2u);
|
| EXPECT_EQ(servers[0], rtc::SocketAddress("server", 3478));
|
| EXPECT_EQ(servers[1], rtc::SocketAddress("server2", 3478));
|
| + EXPECT_EQ(batch_size, 3);
|
| + EXPECT_EQ(total_batches, 3);
|
| servers.clear();
|
|
|
| - params = "///server:3478";
|
| - EXPECT_TRUE(ParseStunProbeParameters(params, &requests_per_ip, &interval_ms,
|
| - &shared_socket_mode, &servers));
|
| + params = "/////server:3478";
|
| + EXPECT_TRUE(StunProberTrial::ParseParameters(
|
| + params, &requests_per_ip, &interval_ms, &shared_socket_mode, &batch_size,
|
| + &total_batches, &servers));
|
| EXPECT_EQ(requests_per_ip, 10);
|
| EXPECT_EQ(servers.size(), 1u);
|
| EXPECT_EQ(servers[0], rtc::SocketAddress("server", 3478));
|
| servers.clear();
|
|
|
| - params = "////";
|
| - EXPECT_FALSE(ParseStunProbeParameters(params, &requests_per_ip, &interval_ms,
|
| - &shared_socket_mode, &servers));
|
| + // Make sure there is no crash. Parsing will fail as there is no server
|
| + // specified.
|
| + params = "/////";
|
| + EXPECT_FALSE(StunProberTrial::ParseParameters(
|
| + params, &requests_per_ip, &interval_ms, &shared_socket_mode, &batch_size,
|
| + &total_batches, &servers));
|
| }
|
|
|
| } // namespace content
|
|
|