Relanding PacketOptions CL after revert

content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/p2p/socket_host_tcp.h"
 
 #include <deque>
 
 #include "base/sys_byteorder.h"
 #include "content/browser/renderer_host/p2p/socket_host_test_utils.h"
@@ skipping 74 matching lines @@
 };
 
 // Verify that we can send STUN message and that they are formatted
 // properly.
 TEST_F(P2PSocketHostTcpTest, SendStunNoAuth) {
   EXPECT_CALL(sender_, Send(
       MatchMessage(static_cast<uint32>(P2PMsg_OnSendComplete::ID))))
       .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()));
   expected_data.append(packet1.begin(), packet1.end());
   expected_data.append(IntToSize(packet2.size()));
   expected_data.append(packet2.begin(), packet2.end());
   expected_data.append(IntToSize(packet3.size()));
   expected_data.append(packet3.begin(), packet3.end());
 
   EXPECT_EQ(expected_data, sent_data_);
 }
 
 // Verify that we can receive STUN messages from the socket, and that
 // the messages are parsed properly.
 TEST_F(P2PSocketHostTcpTest, ReceiveStun) {
   EXPECT_CALL(sender_, Send(
       MatchMessage(static_cast<uint32>(P2PMsg_OnSendComplete::ID))))
       .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()));
   received_data.append(packet1.begin(), packet1.end());
   received_data.append(IntToSize(packet2.size()));
   received_data.append(packet2.begin(), packet2.end());
   received_data.append(IntToSize(packet3.size()));
   received_data.append(packet3.begin(), packet3.end());
 
   EXPECT_CALL(sender_, Send(MatchPacketMessage(packet1)))
@@ skipping 15 matching lines @@
   }
 }
 
 // Verify that we can't send data before we've received STUN response
 // from the other side.
 TEST_F(P2PSocketHostTcpTest, SendDataNoAuth) {
   EXPECT_CALL(sender_, Send(
       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());
 }
 
 // Verify that we can send data after we've received STUN response
 // from the other side.
 TEST_F(P2PSocketHostTcpTest, SendAfterStunRequest) {
   // Receive packet from |dest_|.
   std::vector<char> request_packet;
   CreateStunRequest(&request_packet);
 
   std::string received_data;
   received_data.append(IntToSize(request_packet.size()));
   received_data.append(request_packet.begin(), request_packet.end());
 
   EXPECT_CALL(sender_, Send(
       MatchMessage(static_cast<uint32>(P2PMsg_OnSendComplete::ID))))
       .WillOnce(DoAll(DeleteArg<0>(), Return(true)));
   EXPECT_CALL(sender_, Send(MatchPacketMessage(request_packet)))
       .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()));
   expected_data.append(packet.begin(), packet.end());
 
   EXPECT_EQ(expected_data, sent_data_);
 }
 
 // Verify that asynchronous writes are handled correctly.
 TEST_F(P2PSocketHostTcpTest, AsyncWrites) {
   base::MessageLoop message_loop;
 
   socket_->set_async_write(true);
 
   EXPECT_CALL(sender_, Send(
       MatchMessage(static_cast<uint32>(P2PMsg_OnSendComplete::ID))))
       .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();
 
   std::string expected_data;
   expected_data.append(IntToSize(packet1.size()));
   expected_data.append(packet1.begin(), packet1.end());
   expected_data.append(IntToSize(packet2.size()));
   expected_data.append(packet2.begin(), packet2.end());
 
   EXPECT_EQ(expected_data, sent_data_);
 }
 
 // Verify that we can send STUN message and that they are formatted
 // properly.
 TEST_F(P2PSocketHostStunTcpTest, SendStunNoAuth) {
   EXPECT_CALL(sender_, Send(
       MatchMessage(static_cast<uint32>(P2PMsg_OnSendComplete::ID))))
       .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());
   expected_data.append(packet2.begin(), packet2.end());
   expected_data.append(packet3.begin(), packet3.end());
 
   EXPECT_EQ(expected_data, sent_data_);
 }
 
 // Verify that we can receive STUN messages from the socket, and that
 // the messages are parsed properly.
 TEST_F(P2PSocketHostStunTcpTest, ReceiveStun) {
   EXPECT_CALL(sender_, Send(
       MatchMessage(static_cast<uint32>(P2PMsg_OnSendComplete::ID))))
       .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());
   received_data.append(packet2.begin(), packet2.end());
   received_data.append(packet3.begin(), packet3.end());
 
   EXPECT_CALL(sender_, Send(MatchPacketMessage(packet1)))
       .WillOnce(DoAll(DeleteArg<0>(), Return(true)));
   EXPECT_CALL(sender_, Send(MatchPacketMessage(packet2)))
       .WillOnce(DoAll(DeleteArg<0>(), Return(true)));
@@ skipping 12 matching lines @@
   }
 }
 
 // Verify that we can't send data before we've received STUN response
 // from the other side.
 TEST_F(P2PSocketHostStunTcpTest, SendDataNoAuth) {
   EXPECT_CALL(sender_, Send(
       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());
 }
 
 // Verify that asynchronous writes are handled correctly.
 TEST_F(P2PSocketHostStunTcpTest, AsyncWrites) {
   base::MessageLoop message_loop;
 
   socket_->set_async_write(true);
 
   EXPECT_CALL(sender_, Send(
       MatchMessage(static_cast<uint32>(P2PMsg_OnSendComplete::ID))))
       .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();
 
   std::string expected_data;
   expected_data.append(packet1.begin(), packet1.end());
   expected_data.append(packet2.begin(), packet2.end());
 
   EXPECT_EQ(expected_data, sent_data_);
 }
 
 }  // namespace content