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..1589750fc076639523efb72a42c80dae39dc18cc 100644 |
--- a/content/renderer/media/webrtc/stun_field_trial_unittest.cc |
+++ b/content/renderer/media/webrtc/stun_field_trial_unittest.cc |
@@ -10,34 +10,32 @@ |
namespace content { |
TEST(StunProbeTrial, VerifyParameterParsing) { |
- std::vector<rtc::SocketAddress> servers; |
- int requests_per_ip; |
- int interval_ms; |
- int shared_socket_mode; |
- std::string params; |
- |
- params = "20/500/1/server:3478/server2:3478"; |
- EXPECT_TRUE(ParseStunProbeParameters(params, &requests_per_ip, &interval_ms, |
- &shared_socket_mode, &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)); |
- servers.clear(); |
- |
- params = "///server:3478"; |
- EXPECT_TRUE(ParseStunProbeParameters(params, &requests_per_ip, &interval_ms, |
- &shared_socket_mode, &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)); |
+ StunProberTrial::Param params; |
+ std::string param_line; |
+ |
+ param_line = "20/500/1/3/3/server:3478/server2:3478"; |
+ EXPECT_TRUE(StunProberTrial::ParseParameters(param_line, ¶ms)); |
+ EXPECT_EQ(params.requests_per_ip, 20); |
+ EXPECT_EQ(params.interval_ms, 100); |
+ EXPECT_EQ(params.shared_socket_mode, 1); |
+ EXPECT_EQ(params.servers.size(), 2u); |
+ EXPECT_EQ(params.servers[0], rtc::SocketAddress("server", 3478)); |
+ EXPECT_EQ(params.servers[1], rtc::SocketAddress("server2", 3478)); |
+ EXPECT_EQ(params.batch_size, 3); |
+ EXPECT_EQ(params.total_batches, 3); |
+ params.servers.clear(); |
+ |
+ param_line = "/////server:3478"; |
+ EXPECT_TRUE(StunProberTrial::ParseParameters(param_line, ¶ms)); |
+ EXPECT_EQ(params.requests_per_ip, 10); |
+ EXPECT_EQ(params.servers.size(), 1u); |
+ EXPECT_EQ(params.servers[0], rtc::SocketAddress("server", 3478)); |
+ params.servers.clear(); |
+ |
+ // Make sure there is no crash. Parsing will fail as there is no server |
+ // specified. |
+ param_line = "/////"; |
+ EXPECT_FALSE(StunProberTrial::ParseParameters(param_line, ¶ms)); |
} |
} // namespace content |