Index: webrtc/p2p/base/port_unittest.cc |
diff --git a/webrtc/p2p/base/port_unittest.cc b/webrtc/p2p/base/port_unittest.cc |
index 4caa326a857b7abe80002b81fb1be00581ed383a..c47ceaa98d0d8fccbc996d40018b91a0df0636c2 100644 |
--- a/webrtc/p2p/base/port_unittest.cc |
+++ b/webrtc/p2p/base/port_unittest.cc |
@@ -1775,8 +1775,8 @@ TEST_F(PortTest, TestHandleStunMessage) { |
in_msg->AddMessageIntegrity("rpass"); |
in_msg->AddFingerprint(); |
WriteStunMessage(in_msg.get(), buf.get()); |
- EXPECT_TRUE(port->GetStunMessage(buf->Data(), buf->Length(), addr, |
- out_msg.accept(), &username)); |
+ EXPECT_TRUE(port->GetStunMessage(buf->Data(), buf->Length(), addr, &out_msg, |
+ &username)); |
EXPECT_TRUE(out_msg.get() != NULL); |
EXPECT_EQ("lfrag", username); |
@@ -1787,8 +1787,8 @@ TEST_F(PortTest, TestHandleStunMessage) { |
in_msg->AddMessageIntegrity("rpass"); |
in_msg->AddFingerprint(); |
WriteStunMessage(in_msg.get(), buf.get()); |
- EXPECT_TRUE(port->GetStunMessage(buf->Data(), buf->Length(), addr, |
- out_msg.accept(), &username)); |
+ EXPECT_TRUE(port->GetStunMessage(buf->Data(), buf->Length(), addr, &out_msg, |
+ &username)); |
EXPECT_TRUE(out_msg.get() != NULL); |
EXPECT_EQ("", username); |
@@ -1798,8 +1798,8 @@ TEST_F(PortTest, TestHandleStunMessage) { |
STUN_ERROR_SERVER_ERROR, STUN_ERROR_REASON_SERVER_ERROR)); |
in_msg->AddFingerprint(); |
WriteStunMessage(in_msg.get(), buf.get()); |
- EXPECT_TRUE(port->GetStunMessage(buf->Data(), buf->Length(), addr, |
- out_msg.accept(), &username)); |
+ EXPECT_TRUE(port->GetStunMessage(buf->Data(), buf->Length(), addr, &out_msg, |
+ &username)); |
EXPECT_TRUE(out_msg.get() != NULL); |
EXPECT_EQ("", username); |
ASSERT_TRUE(out_msg->GetErrorCode() != NULL); |
@@ -1823,8 +1823,8 @@ TEST_F(PortTest, TestHandleStunMessageBadUsername) { |
in_msg->AddMessageIntegrity("rpass"); |
in_msg->AddFingerprint(); |
WriteStunMessage(in_msg.get(), buf.get()); |
- EXPECT_TRUE(port->GetStunMessage(buf->Data(), buf->Length(), addr, |
- out_msg.accept(), &username)); |
+ EXPECT_TRUE(port->GetStunMessage(buf->Data(), buf->Length(), addr, &out_msg, |
+ &username)); |
EXPECT_TRUE(out_msg.get() == NULL); |
EXPECT_EQ("", username); |
EXPECT_EQ(STUN_ERROR_BAD_REQUEST, port->last_stun_error_code()); |
@@ -1834,8 +1834,8 @@ TEST_F(PortTest, TestHandleStunMessageBadUsername) { |
in_msg->AddMessageIntegrity("rpass"); |
in_msg->AddFingerprint(); |
WriteStunMessage(in_msg.get(), buf.get()); |
- EXPECT_TRUE(port->GetStunMessage(buf->Data(), buf->Length(), addr, |
- out_msg.accept(), &username)); |
+ EXPECT_TRUE(port->GetStunMessage(buf->Data(), buf->Length(), addr, &out_msg, |
+ &username)); |
EXPECT_TRUE(out_msg.get() == NULL); |
EXPECT_EQ("", username); |
EXPECT_EQ(STUN_ERROR_UNAUTHORIZED, port->last_stun_error_code()); |
@@ -1845,8 +1845,8 @@ TEST_F(PortTest, TestHandleStunMessageBadUsername) { |
in_msg->AddMessageIntegrity("rpass"); |
in_msg->AddFingerprint(); |
WriteStunMessage(in_msg.get(), buf.get()); |
- EXPECT_TRUE(port->GetStunMessage(buf->Data(), buf->Length(), addr, |
- out_msg.accept(), &username)); |
+ EXPECT_TRUE(port->GetStunMessage(buf->Data(), buf->Length(), addr, &out_msg, |
+ &username)); |
EXPECT_TRUE(out_msg.get() == NULL); |
EXPECT_EQ("", username); |
EXPECT_EQ(STUN_ERROR_UNAUTHORIZED, port->last_stun_error_code()); |
@@ -1857,8 +1857,8 @@ TEST_F(PortTest, TestHandleStunMessageBadUsername) { |
in_msg->AddMessageIntegrity("rpass"); |
in_msg->AddFingerprint(); |
WriteStunMessage(in_msg.get(), buf.get()); |
- EXPECT_TRUE(port->GetStunMessage(buf->Data(), buf->Length(), addr, |
- out_msg.accept(), &username)); |
+ EXPECT_TRUE(port->GetStunMessage(buf->Data(), buf->Length(), addr, &out_msg, |
+ &username)); |
EXPECT_TRUE(out_msg.get() == NULL); |
EXPECT_EQ("", username); |
EXPECT_EQ(STUN_ERROR_UNAUTHORIZED, port->last_stun_error_code()); |
@@ -1869,8 +1869,8 @@ TEST_F(PortTest, TestHandleStunMessageBadUsername) { |
in_msg->AddMessageIntegrity("rpass"); |
in_msg->AddFingerprint(); |
WriteStunMessage(in_msg.get(), buf.get()); |
- EXPECT_TRUE(port->GetStunMessage(buf->Data(), buf->Length(), addr, |
- out_msg.accept(), &username)); |
+ EXPECT_TRUE(port->GetStunMessage(buf->Data(), buf->Length(), addr, &out_msg, |
+ &username)); |
EXPECT_TRUE(out_msg.get() == NULL); |
EXPECT_EQ("", username); |
EXPECT_EQ(STUN_ERROR_UNAUTHORIZED, port->last_stun_error_code()); |
@@ -1893,8 +1893,8 @@ TEST_F(PortTest, TestHandleStunMessageBadMessageIntegrity) { |
"rfrag:lfrag")); |
in_msg->AddFingerprint(); |
WriteStunMessage(in_msg.get(), buf.get()); |
- EXPECT_TRUE(port->GetStunMessage(buf->Data(), buf->Length(), addr, |
- out_msg.accept(), &username)); |
+ EXPECT_TRUE(port->GetStunMessage(buf->Data(), buf->Length(), addr, &out_msg, |
+ &username)); |
EXPECT_TRUE(out_msg.get() == NULL); |
EXPECT_EQ("", username); |
EXPECT_EQ(STUN_ERROR_BAD_REQUEST, port->last_stun_error_code()); |
@@ -1906,8 +1906,8 @@ TEST_F(PortTest, TestHandleStunMessageBadMessageIntegrity) { |
in_msg->AddMessageIntegrity("invalid"); |
in_msg->AddFingerprint(); |
WriteStunMessage(in_msg.get(), buf.get()); |
- EXPECT_TRUE(port->GetStunMessage(buf->Data(), buf->Length(), addr, |
- out_msg.accept(), &username)); |
+ EXPECT_TRUE(port->GetStunMessage(buf->Data(), buf->Length(), addr, &out_msg, |
+ &username)); |
EXPECT_TRUE(out_msg.get() == NULL); |
EXPECT_EQ("", username); |
EXPECT_EQ(STUN_ERROR_UNAUTHORIZED, port->last_stun_error_code()); |
@@ -1934,16 +1934,16 @@ TEST_F(PortTest, TestHandleStunMessageBadFingerprint) { |
"rfrag:lfrag")); |
in_msg->AddMessageIntegrity("rpass"); |
WriteStunMessage(in_msg.get(), buf.get()); |
- EXPECT_FALSE(port->GetStunMessage(buf->Data(), buf->Length(), addr, |
- out_msg.accept(), &username)); |
+ EXPECT_FALSE(port->GetStunMessage(buf->Data(), buf->Length(), addr, &out_msg, |
+ &username)); |
EXPECT_EQ(0, port->last_stun_error_code()); |
// Now, add a fingerprint, but munge the message so it's not valid. |
in_msg->AddFingerprint(); |
in_msg->SetTransactionID("TESTTESTBADD"); |
WriteStunMessage(in_msg.get(), buf.get()); |
- EXPECT_FALSE(port->GetStunMessage(buf->Data(), buf->Length(), addr, |
- out_msg.accept(), &username)); |
+ EXPECT_FALSE(port->GetStunMessage(buf->Data(), buf->Length(), addr, &out_msg, |
+ &username)); |
EXPECT_EQ(0, port->last_stun_error_code()); |
// Valid BINDING-RESPONSE, except no FINGERPRINT. |
@@ -1952,16 +1952,16 @@ TEST_F(PortTest, TestHandleStunMessageBadFingerprint) { |
new StunXorAddressAttribute(STUN_ATTR_XOR_MAPPED_ADDRESS, kLocalAddr2)); |
in_msg->AddMessageIntegrity("rpass"); |
WriteStunMessage(in_msg.get(), buf.get()); |
- EXPECT_FALSE(port->GetStunMessage(buf->Data(), buf->Length(), addr, |
- out_msg.accept(), &username)); |
+ EXPECT_FALSE(port->GetStunMessage(buf->Data(), buf->Length(), addr, &out_msg, |
+ &username)); |
EXPECT_EQ(0, port->last_stun_error_code()); |
// Now, add a fingerprint, but munge the message so it's not valid. |
in_msg->AddFingerprint(); |
in_msg->SetTransactionID("TESTTESTBADD"); |
WriteStunMessage(in_msg.get(), buf.get()); |
- EXPECT_FALSE(port->GetStunMessage(buf->Data(), buf->Length(), addr, |
- out_msg.accept(), &username)); |
+ EXPECT_FALSE(port->GetStunMessage(buf->Data(), buf->Length(), addr, &out_msg, |
+ &username)); |
EXPECT_EQ(0, port->last_stun_error_code()); |
// Valid BINDING-ERROR-RESPONSE, except no FINGERPRINT. |
@@ -1970,16 +1970,16 @@ TEST_F(PortTest, TestHandleStunMessageBadFingerprint) { |
STUN_ERROR_SERVER_ERROR, STUN_ERROR_REASON_SERVER_ERROR)); |
in_msg->AddMessageIntegrity("rpass"); |
WriteStunMessage(in_msg.get(), buf.get()); |
- EXPECT_FALSE(port->GetStunMessage(buf->Data(), buf->Length(), addr, |
- out_msg.accept(), &username)); |
+ EXPECT_FALSE(port->GetStunMessage(buf->Data(), buf->Length(), addr, &out_msg, |
+ &username)); |
EXPECT_EQ(0, port->last_stun_error_code()); |
// Now, add a fingerprint, but munge the message so it's not valid. |
in_msg->AddFingerprint(); |
in_msg->SetTransactionID("TESTTESTBADD"); |
WriteStunMessage(in_msg.get(), buf.get()); |
- EXPECT_FALSE(port->GetStunMessage(buf->Data(), buf->Length(), addr, |
- out_msg.accept(), &username)); |
+ EXPECT_FALSE(port->GetStunMessage(buf->Data(), buf->Length(), addr, &out_msg, |
+ &username)); |
EXPECT_EQ(0, port->last_stun_error_code()); |
} |
@@ -2000,8 +2000,8 @@ TEST_F(PortTest, TestHandleStunBindingIndication) { |
in_msg.reset(CreateStunMessage(STUN_BINDING_INDICATION)); |
in_msg->AddFingerprint(); |
WriteStunMessage(in_msg.get(), buf.get()); |
- EXPECT_TRUE(lport->GetStunMessage(buf->Data(), buf->Length(), addr, |
- out_msg.accept(), &username)); |
+ EXPECT_TRUE(lport->GetStunMessage(buf->Data(), buf->Length(), addr, &out_msg, |
+ &username)); |
EXPECT_TRUE(out_msg.get() != NULL); |
EXPECT_EQ(out_msg->type(), STUN_BINDING_INDICATION); |
EXPECT_EQ("", username); |