| Index: content/renderer/p2p/socket_client_impl.cc
|
| diff --git a/content/renderer/p2p/socket_client_impl.cc b/content/renderer/p2p/socket_client_impl.cc
|
| index 063c7851fc20ba9d4267cef84df5e291d3d893d6..9f3298b9abec2a4be2f29433077b966e236b88d8 100644
|
| --- a/content/renderer/p2p/socket_client_impl.cc
|
| +++ b/content/renderer/p2p/socket_client_impl.cc
|
| @@ -79,14 +79,15 @@ void P2PSocketClientImpl::DoInit(P2PSocketType type,
|
| type, socket_id_, local_address, remote_address));
|
| }
|
|
|
| -void P2PSocketClientImpl::SendWithDscp(
|
| +void P2PSocketClientImpl::SendWithOptions(
|
| const net::IPEndPoint& address,
|
| const std::vector<char>& data,
|
| - net::DiffServCodePoint dscp) {
|
| + const talk_base::PacketOptions& options) {
|
| if (!ipc_message_loop_->BelongsToCurrentThread()) {
|
| ipc_message_loop_->PostTask(
|
| FROM_HERE, base::Bind(
|
| - &P2PSocketClientImpl::SendWithDscp, this, address, data, dscp));
|
| + &P2PSocketClientImpl::SendWithOptions, this, address,
|
| + data, options));
|
| return;
|
| }
|
|
|
| @@ -96,13 +97,14 @@ void P2PSocketClientImpl::SendWithDscp(
|
| uint64 unique_id = GetUniqueId(random_socket_id_, ++next_packet_id_);
|
| TRACE_EVENT_ASYNC_BEGIN0("p2p", "Send", unique_id);
|
| dispatcher_->SendP2PMessage(new P2PHostMsg_Send(socket_id_, address, data,
|
| - dscp, unique_id));
|
| + options, unique_id));
|
| }
|
| }
|
|
|
| void P2PSocketClientImpl::Send(const net::IPEndPoint& address,
|
| const std::vector<char>& data) {
|
| - SendWithDscp(address, data, net::DSCP_DEFAULT);
|
| + talk_base::PacketOptions options(talk_base::DSCP_DEFAULT);
|
| + SendWithOptions(address, data, options);
|
| }
|
|
|
| void P2PSocketClientImpl::SetOption(P2PSocketOption option,
|
|
|