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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc

Issue 184813006: Relanding PacketOptions CL after revert (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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
« no previous file with comments | « content/browser/renderer_host/p2p/socket_host_tcp_server.cc ('k') | content/browser/renderer_host/p2p/socket_host_udp.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc b/content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc
index cae88bd1c700b4cb379058d853b52b1ba68260be..90414252477229428ada0f09cee2ec639c41d99d 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc
+++ b/content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc
@@ -92,17 +92,18 @@ TEST_F(P2PSocketHostTcpTest, SendStunNoAuth) {
.Times(3)
.WillRepeatedly(DoAll(DeleteArg<0>(), Return(true)));
+ talk_base::PacketOptions options;
std::vector<char> packet1;
CreateStunRequest(&packet1);
- socket_host_->Send(dest_, packet1, net::DSCP_NO_CHANGE, 0);
+ socket_host_->Send(dest_, packet1, options, 0);
std::vector<char> packet2;
CreateStunResponse(&packet2);
- socket_host_->Send(dest_, packet2, net::DSCP_NO_CHANGE, 0);
+ socket_host_->Send(dest_, packet2, options, 0);
std::vector<char> packet3;
CreateStunError(&packet3);
- socket_host_->Send(dest_, packet3, net::DSCP_NO_CHANGE, 0);
+ socket_host_->Send(dest_, packet3, options, 0);
std::string expected_data;
expected_data.append(IntToSize(packet1.size()));
@@ -123,17 +124,18 @@ TEST_F(P2PSocketHostTcpTest, ReceiveStun) {
.Times(3)
.WillRepeatedly(DoAll(DeleteArg<0>(), Return(true)));
+ talk_base::PacketOptions options;
std::vector<char> packet1;
CreateStunRequest(&packet1);
- socket_host_->Send(dest_, packet1, net::DSCP_NO_CHANGE, 0);
+ socket_host_->Send(dest_, packet1, options, 0);
std::vector<char> packet2;
CreateStunResponse(&packet2);
- socket_host_->Send(dest_, packet2, net::DSCP_NO_CHANGE, 0);
+ socket_host_->Send(dest_, packet2, options, 0);
std::vector<char> packet3;
CreateStunError(&packet3);
- socket_host_->Send(dest_, packet3, net::DSCP_NO_CHANGE, 0);
+ socket_host_->Send(dest_, packet3, options, 0);
std::string received_data;
received_data.append(IntToSize(packet1.size()));
@@ -169,9 +171,10 @@ TEST_F(P2PSocketHostTcpTest, SendDataNoAuth) {
MatchMessage(static_cast<uint32>(P2PMsg_OnError::ID))))
.WillOnce(DoAll(DeleteArg<0>(), Return(true)));
+ talk_base::PacketOptions options;
std::vector<char> packet;
CreateRandomPacket(&packet);
- socket_host_->Send(dest_, packet, net::DSCP_NO_CHANGE, 0);
+ socket_host_->Send(dest_, packet, options, 0);
EXPECT_EQ(0U, sent_data_.size());
}
@@ -194,10 +197,11 @@ TEST_F(P2PSocketHostTcpTest, SendAfterStunRequest) {
.WillOnce(DoAll(DeleteArg<0>(), Return(true)));
socket_->AppendInputData(&received_data[0], received_data.size());
+ talk_base::PacketOptions options;
// Now we should be able to send any data to |dest_|.
std::vector<char> packet;
CreateRandomPacket(&packet);
- socket_host_->Send(dest_, packet, net::DSCP_NO_CHANGE, 0);
+ socket_host_->Send(dest_, packet, options, 0);
std::string expected_data;
expected_data.append(IntToSize(packet.size()));
@@ -217,14 +221,15 @@ TEST_F(P2PSocketHostTcpTest, AsyncWrites) {
.Times(2)
.WillRepeatedly(DoAll(DeleteArg<0>(), Return(true)));
+ talk_base::PacketOptions options;
std::vector<char> packet1;
CreateStunRequest(&packet1);
- socket_host_->Send(dest_, packet1, net::DSCP_NO_CHANGE, 0);
+ socket_host_->Send(dest_, packet1, options, 0);
std::vector<char> packet2;
CreateStunResponse(&packet2);
- socket_host_->Send(dest_, packet2, net::DSCP_NO_CHANGE, 0);
+ socket_host_->Send(dest_, packet2, options, 0);
message_loop.RunUntilIdle();
@@ -245,17 +250,18 @@ TEST_F(P2PSocketHostStunTcpTest, SendStunNoAuth) {
.Times(3)
.WillRepeatedly(DoAll(DeleteArg<0>(), Return(true)));
+ talk_base::PacketOptions options;
std::vector<char> packet1;
CreateStunRequest(&packet1);
- socket_host_->Send(dest_, packet1, net::DSCP_NO_CHANGE, 0);
+ socket_host_->Send(dest_, packet1, options, 0);
std::vector<char> packet2;
CreateStunResponse(&packet2);
- socket_host_->Send(dest_, packet2, net::DSCP_NO_CHANGE, 0);
+ socket_host_->Send(dest_, packet2, options, 0);
std::vector<char> packet3;
CreateStunError(&packet3);
- socket_host_->Send(dest_, packet3, net::DSCP_NO_CHANGE, 0);
+ socket_host_->Send(dest_, packet3, options, 0);
std::string expected_data;
expected_data.append(packet1.begin(), packet1.end());
@@ -273,17 +279,18 @@ TEST_F(P2PSocketHostStunTcpTest, ReceiveStun) {
.Times(3)
.WillRepeatedly(DoAll(DeleteArg<0>(), Return(true)));
+ talk_base::PacketOptions options;
std::vector<char> packet1;
CreateStunRequest(&packet1);
- socket_host_->Send(dest_, packet1, net::DSCP_NO_CHANGE, 0);
+ socket_host_->Send(dest_, packet1, options, 0);
std::vector<char> packet2;
CreateStunResponse(&packet2);
- socket_host_->Send(dest_, packet2, net::DSCP_NO_CHANGE, 0);
+ socket_host_->Send(dest_, packet2, options, 0);
std::vector<char> packet3;
CreateStunError(&packet3);
- socket_host_->Send(dest_, packet3, net::DSCP_NO_CHANGE, 0);
+ socket_host_->Send(dest_, packet3, options, 0);
std::string received_data;
received_data.append(packet1.begin(), packet1.end());
@@ -316,9 +323,10 @@ TEST_F(P2PSocketHostStunTcpTest, SendDataNoAuth) {
MatchMessage(static_cast<uint32>(P2PMsg_OnError::ID))))
.WillOnce(DoAll(DeleteArg<0>(), Return(true)));
+ talk_base::PacketOptions options;
std::vector<char> packet;
CreateRandomPacket(&packet);
- socket_host_->Send(dest_, packet, net::DSCP_NO_CHANGE, 0);
+ socket_host_->Send(dest_, packet, options, 0);
EXPECT_EQ(0U, sent_data_.size());
}
@@ -334,13 +342,14 @@ TEST_F(P2PSocketHostStunTcpTest, AsyncWrites) {
.Times(2)
.WillRepeatedly(DoAll(DeleteArg<0>(), Return(true)));
+ talk_base::PacketOptions options;
std::vector<char> packet1;
CreateStunRequest(&packet1);
- socket_host_->Send(dest_, packet1, net::DSCP_NO_CHANGE,0);
+ socket_host_->Send(dest_, packet1, options, 0);
std::vector<char> packet2;
CreateStunResponse(&packet2);
- socket_host_->Send(dest_, packet2, net::DSCP_NO_CHANGE, 0);
+ socket_host_->Send(dest_, packet2, options, 0);
message_loop.RunUntilIdle();
« no previous file with comments | « content/browser/renderer_host/p2p/socket_host_tcp_server.cc ('k') | content/browser/renderer_host/p2p/socket_host_udp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698